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

Merge pull request #1779 from peppy/fix-regression

Browse Source 
Fix regression during merges
This commit is contained in:
Dan Balasescu 2017-12-28 00:50:04 +09:00 committed by GitHub
commit ee1baed0e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/OsuGame.cs
View File

@ -440,12 +440,16 @@ namespace osu.Game
private void screenAdded(Screen newScreen)
{
currentScreen = (OsuScreen)newScreen;
newScreen.ModePushed += screenAdded;
newScreen.Exited += screenRemoved;
}
private void screenRemoved(Screen newScreen)
{
currentScreen = (OsuScreen)newScreen;
if (newScreen == null)
Exit();
}