From 095b7f86685799249f5427ba7010f55a6a7e6646 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:09:12 +0900
Subject: [PATCH] Rewrite code to account for non-loaded edge case

---
 osu.Game/OsuGame.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e2f0f0c05b..be919d60ca 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -758,13 +758,15 @@ namespace osu.Game
         {
             otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
 
-            // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
-            if (overlay.LoadState < LoadState.Ready)
+            // Partially visible so leave it at the current depth.
+            if (overlay.IsPresent)
                 return;
 
-            // show above others if not visible at all, else leave at current depth.
-            if (!overlay.IsPresent)
+            // Show above all other overlays.
+            if (overlay.IsLoaded)
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
+            else
+                overlay.Depth = (float)-Clock.CurrentTime;
         }
 
         private void forwardLoggedErrorsToNotifications()