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

@ -42,7 +42,7 @@ namespace osu.Game.Screens
// once it's done.
if (screen.LoadState == LoadState.NotLoaded)
{
screen.Preload(game, d => Push((BackgroundScreen)d));
screen.LoadAsync(game, d => Push((BackgroundScreen)d));
return true;
}