h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00
Code Issues Releases Wiki Activity

Apply same comment & reworded condition to suspend too

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-05-30 21:54:56 +02:00
parent 741ee84ed6
commit 62d1774407
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -133,7 +133,7 @@ namespace osu.Game.Screens.OnlinePlay
Debug.Assert(screenStack.CurrentScreen != null); Debug.Assert(screenStack.CurrentScreen != null);
// if a subscreen was pushed to the nested stack while this screen was not present, this path will proxy `OnResuming()` // if a subscreen was pushed to the nested stack while the stack was not present, this path will proxy `OnResuming()`
// to the subscreen before `OnEntering()` can even be called for the subscreen, breaking ordering expectations. // to the subscreen before `OnEntering()` can even be called for the subscreen, breaking ordering expectations.
// to work around this, do not proxy resume to screens that haven't loaded yet. // to work around this, do not proxy resume to screens that haven't loaded yet.
if ((screenStack.CurrentScreen as Drawable)?.IsLoaded == true) if ((screenStack.CurrentScreen as Drawable)?.IsLoaded == true)
@ -149,7 +149,10 @@ namespace osu.Game.Screens.OnlinePlay
Debug.Assert(screenStack.CurrentScreen != null); Debug.Assert(screenStack.CurrentScreen != null);
if (screenStack.CurrentScreen.IsCurrentScreen()) // if a subscreen was pushed to the nested stack while the stack was not present, this path will proxy `OnSuspending()`
// to the subscreen before `OnEntering()` can even be called for the subscreen, breaking ordering expectations.
// to work around this, do not proxy suspend to screens that haven't loaded yet.
if ((screenStack.CurrentScreen as Drawable)?.IsLoaded == true)
screenStack.CurrentScreen.OnSuspending(e); screenStack.CurrentScreen.OnSuspending(e);
} }