RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move reset logic to OsuGame

This commit is contained in:
Dean Herbert 2020-10-08 18:29:19 +09:00
parent 43a575484a
commit dbdb25ccf7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/OsuGame.cs
View File

@ -957,6 +957,9 @@ protected virtual void ScreenChanged(IScreen current, IScreen newScreen)
break;
}
// reset on screen change for sanity.
LocalUserPlaying.Value = false;
if (current is IOsuScreen currentOsuScreen)
OverlayActivationMode.UnbindFrom(currentOsuScreen.OverlayActivationMode);

4
osu.Game/Screens/Play/Player.cs
View File

@ -666,8 +666,6 @@ public override void OnSuspending(IScreen next)
{
screenSuspension?.Expire();
LocalUserPlaying.Value = false;
fadeOut();
base.OnSuspending(next);
}
@ -697,8 +695,6 @@ public override bool OnExiting(IScreen next)
musicController.ResetTrackAdjustments();
LocalUserPlaying.Value = false;
fadeOut();
return base.OnExiting(next);
}