h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 02:02:53 +08:00
Code Issues Releases Wiki Activity

Remove misleading beatmap import method.

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

7
osu.Game/OsuGame.cs
View File

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