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

Merge pull request #12073 from peppy/fix-crash-toggle-overlay-before-loaded

Browse Source 
Avoid potential crash if an overlay is toggled before it has been loaded
This commit is contained in:
Dan Balasescu 2021-03-19 21:38:47 +09:00 committed by GitHub
commit 5a6ff53837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/OsuGame.cs
View File

@ -758,9 +758,15 @@ namespace osu.Game
{ {
otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide()); otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
// show above others if not visible at all, else leave at current depth. // Partially visible so leave it at the current depth.
if (!overlay.IsPresent) if (overlay.IsPresent)
return;
// Show above all other overlays.
if (overlay.IsLoaded)
overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime); overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
else
overlay.Depth = (float)-Clock.CurrentTime;
} }
private void forwardLoggedErrorsToNotifications() private void forwardLoggedErrorsToNotifications()