Merge pull request #12922 from peppy/fix-bad-make-current-call

Fix `Player` potentially running `MakeCurrent` when already removed from the screen stack
2026-05-21 01:00:27 +08:00 · 2021-05-28 00:42:42 +09:00
parent fd7a6db774 7e0a4562c9
commit 8dce147b8a
1 changed files with 4 additions and 1 deletions
@@ -522,7 +522,10 @@ namespace osu.Game.Screens.Play
            if (!this.IsCurrentScreen())
            {
                ValidForResume = false;
-                this.MakeCurrent();
+
+                // in the potential case that this instance has already been exited, this is required to avoid a crash.
+                if (this.GetChildScreen() != null)
+                    this.MakeCurrent();
                return;
            }