Merge remote-tracking branch 'upstream/master' into remove-usings

This commit is contained in:
Dean Herbert
2017-02-24 11:29:34 +09:00
25 changed files with 38 additions and 43 deletions

View File

@ -56,7 +56,7 @@ namespace osu.Game.Tests.Beatmaps.IO
var osu = loadOsu(host);
var importer = new BeatmapImporter(client);
if (!importer.Import(osz_path).Wait(1000))
if (!importer.ImportAsync(osz_path).Wait(1000))
Assert.Fail(@"IPC took too long to send");
ensureLoaded(osu, 10000);