RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove misleading beatmap import method.

This commit is contained in:
Dean Herbert 2017-03-04 16:47:37 +09:00
parent adb6f01e39
commit b294386077
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Desktop/OsuGameDesktop.cs
View File

@ -9,6 +9,7 @@
using osu.Desktop.Overlays;
using System.Reflection;
using System.Drawing;
using System.Threading.Tasks;
using osu.Game.Screens.Menu;
namespace osu.Desktop
@ -56,7 +57,7 @@ private void dragDrop(DragEventArgs e)
// this method will only be executed if e.Effect in dragEnter gets set to something other that None.
var dropData = e.Data.GetData(DataFormats.FileDrop) as object[];
var filePaths = dropData.Select(f => f.ToString()).ToArray();
ImportBeatmapsAsync(filePaths);
Task.Run(() => BeatmapDatabase.Import(filePaths));
}
private void dragEnter(DragEventArgs e)

7
osu.Game/OsuGame.cs
View File

@ -84,7 +84,7 @@ private void load()
if (args?.Length > 0)
{
var paths = args.Where(a => !a.StartsWith(@"-"));
ImportBeatmapsAsync(paths);
Task.Run(() => BeatmapDatabase.Import(paths));
}
Dependencies.Cache(this);
@ -92,11 +92,6 @@ private void load()
PlayMode = LocalConfig.GetBindable<PlayMode>(OsuConfig.PlayMode);
}
protected async void ImportBeatmapsAsync(IEnumerable<string> paths)
{
await Task.Run(() => BeatmapDatabase.Import(paths));
}
protected override void LoadComplete()
{
base.LoadComplete();