mirror of
https://github.com/osukey/osukey.git
synced 2025-08-05 23:53:51 +09:00
Merge pull request #1779 from peppy/fix-regression
Fix regression during merges
This commit is contained in:
@ -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();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user