Merge pull request #1779 from peppy/fix-regression

Fix regression during merges
This commit is contained in:
Dan Balasescu
2017-12-28 00:50:04 +09:00
committed by GitHub

View File

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