sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #441 from tacchinotacchi/archive-reader"

Browse Source 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
This commit is contained in:
Dean Herbert
2017-03-14 11:46:34 +09:00
parent 29eeebefb0
commit ba10c3a8db
10 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Desktop/OsuGameDesktop.cs
View File

@ -12,7 +12,6 @@ using System.Drawing;
using System.IO;
using System.Threading.Tasks;
using osu.Game.Screens.Menu;
using osu.Game.Beatmaps.IO;
namespace osu.Desktop
{
@ -58,7 +57,7 @@ namespace osu.Desktop
var dropData = (object[])e.Data.GetData(DataFormats.FileDrop);
var filePaths = dropData.Select(f => f.ToString()).ToArray();
if (filePaths.All(f => Path.GetExtension(f) == BeatmapArchiveReader.OSZ_EXTENSION))
if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
Task.Run(() => BeatmapDatabase.Import(filePaths));
else if (filePaths.All(f => Path.GetExtension(f) == @".osr"))
Task.Run(() =>
@ -68,7 +67,7 @@ namespace osu.Desktop
});
}
private static readonly string[] allowed_extensions = { BeatmapArchiveReader.OSZ_EXTENSION, @".osr" };
private static readonly string[] allowed_extensions = { @".osz", @".osr" };
private void dragEnter(DragEventArgs e)
{