Merge branch 'allow-back-in-player' into release

Merge branch 'fix-background-screen-crash' into release
2026-05-13 21:53:29 +08:00 · 2018-07-01 15:53:02 +09:00 · 2018-07-01 15:46:43 +09:00 · 2018-07-01 15:46:26 +09:00 · 2018-06-29 23:36:30 +09:00 · 2018-06-29 20:16:24 +09:00
2 changed files with 12 additions and 6 deletions
@@ -40,7 +40,14 @@ namespace osu.Game.Screens
            while (screen.LoadState < LoadState.Ready)
                Thread.Sleep(1);

-            base.Push(screen);
+            try
+            {
+                base.Push(screen);
+            }
+            catch (ScreenAlreadyExitedException)
+            {
+                // screen may have exited before the push was successful.
+            }
        }

        protected override void Update()
@@ -183,11 +183,10 @@ namespace osu.Game.Screens

            if (Background != null && !Background.Equals(nextOsu?.Background))
            {
-                if (nextOsu != null)
-                    //We need to use MakeCurrent in case we are jumping up multiple game screens.
-                    nextOsu.Background?.MakeCurrent();
-                else
-                    Background.Exit();
+                Background.Exit();
+
+                //We need to use MakeCurrent in case we are jumping up multiple game screens.
+                nextOsu?.Background?.MakeCurrent();
            }

            if (base.OnExiting(next))