h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:07:25 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Fix-music-playing-while-exiting-from-editor

Browse Source
This commit is contained in:
Oskar Solecki 2019-07-09 00:11:29 +02:00 committed by GitHub
commit a4957909b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Edit/Editor.cs
View File

@ -168,6 +168,8 @@ namespace osu.Game.Screens.Edit
menuBar.Mode.ValueChanged += onModeChanged; menuBar.Mode.ValueChanged += onModeChanged;
host.Exiting += onExitingGame;
bottomBackground.Colour = colours.Gray2; bottomBackground.Colour = colours.Gray2;
} }
@ -235,6 +237,8 @@ namespace osu.Game.Screens.Edit
Beatmap.Value.Track?.Stop(); Beatmap.Value.Track?.Stop();
} }
private bool isExitingGame = false;
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
Background.FadeColour(Color4.White, 500); Background.FadeColour(Color4.White, 500);
@ -275,5 +279,7 @@ namespace osu.Game.Screens.Edit
else else
clock.SeekForward(!clock.IsRunning, amount); clock.SeekForward(!clock.IsRunning, amount);
} }
private bool onExitingGame() => isExitingGame = true;
} }
} }