diff --git a/osu-framework b/osu-framework index 6b884e1b80..c3a7ebd979 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 6b884e1b80444c5249754634a4b5529c50b52934 +Subproject commit c3a7ebd979c9a6b19871dc84337905f97c56a6aa diff --git a/osu.Game/GameModes/Menu/Intro.cs b/osu.Game/GameModes/Menu/Intro.cs index 30ca6f931c..78e0d15b0e 100644 --- a/osu.Game/GameModes/Menu/Intro.cs +++ b/osu.Game/GameModes/Menu/Intro.cs @@ -44,18 +44,18 @@ namespace osu.Game.GameModes.Menu AudioTrack bgm = Game.Audio.Track.Get(@"circles"); bgm.Looping = true; - Game.Scheduler.Add(delegate + Scheduler.Add(delegate { welcome.Play(); }, true); - Game.Scheduler.AddDelayed(delegate + Scheduler.AddDelayed(delegate { bgm.Start(); }, 600); - Game.Scheduler.AddDelayed(delegate + Scheduler.AddDelayed(delegate { DidLoadMenu = true; Push(new MainMenu()); @@ -82,7 +82,7 @@ namespace osu.Game.GameModes.Menu protected override void OnResuming(GameMode last) { //we are just an intro. if we are resumed, we just want to exit after a short delay (to allow the last mode to transition out). - Game.Scheduler.AddDelayed(Exit, 300); + Scheduler.AddDelayed(Exit, 300); base.OnResuming(last); } diff --git a/osu.Game/GameModes/Menu/MainMenu.cs b/osu.Game/GameModes/Menu/MainMenu.cs index 3ee28f5d03..e74c83e03d 100644 --- a/osu.Game/GameModes/Menu/MainMenu.cs +++ b/osu.Game/GameModes/Menu/MainMenu.cs @@ -47,7 +47,7 @@ namespace osu.Game.GameModes.Menu OnSolo = delegate { Push(new PlaySongSelect()); }, OnMulti = delegate { Push(new Lobby()); }, OnTest = delegate { Push(new TestBrowser()); }, - OnExit = delegate { Game.Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); }, + OnExit = delegate { Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); }, OnSettings = delegate { osu.Options.PoppedOut = !osu.Options.PoppedOut; },