From a45ca2ad101957b9e00560a0b66a01508e724168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 7 May 2022 22:50:10 +0200
Subject: [PATCH] Fix focused overlays not registering as such

Also fixes bug wherein opening skin editor at song select with mod
select open would show mod select on top of the skin editor.
---
 osu.Game/OsuGame.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index c2a96a9082..54c4231b06 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -201,6 +201,10 @@ namespace osu.Game
 
             externalOverlays.Add(overlayContainer);
             overlayContent.Add(overlayContainer);
+
+            if (overlayContainer is OsuFocusedOverlayContainer focusedOverlayContainer)
+                focusedOverlays.Add(focusedOverlayContainer);
+
             return new InvokeOnDisposal(() => unregisterBlockingOverlay(overlayContainer));
         }
 
@@ -223,6 +227,10 @@ namespace osu.Game
         private void unregisterBlockingOverlay(OverlayContainer overlayContainer)
         {
             externalOverlays.Remove(overlayContainer);
+
+            if (overlayContainer is OsuFocusedOverlayContainer focusedOverlayContainer)
+                focusedOverlays.Remove(focusedOverlayContainer);
+
             overlayContainer.Expire();
         }