From 1dbb2a4d376a61d744292967e077cd20eb0b7780 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 1 Aug 2022 07:52:07 -0700
Subject: [PATCH] Fix online play screen only accounting for current sub screen
 onexiting blocks

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 61ea7d68ee..ad52363c95 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -147,9 +147,14 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            var subScreen = screenStack.CurrentScreen as Drawable;
-            if (subScreen?.IsLoaded == true && screenStack.CurrentScreen.OnExiting(e))
-                return true;
+            while (screenStack.CurrentScreen is not LoungeSubScreen)
+            {
+                var lastSubScreen = screenStack.CurrentScreen;
+                if (((Drawable)lastSubScreen)?.IsLoaded == true)
+                    screenStack.Exit();
+
+                if (lastSubScreen == screenStack.CurrentScreen) return true;
+            }
 
             RoomManager.PartRoom();