From 9140893249037130c9a2bae7bd67be20f8be098a Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Sat, 30 Nov 2024 23:36:02 -0500
Subject: [PATCH 1/2] Fix score no longer being saved when quick-restarting
 after pass

---
 .../Visual/Mods/TestSceneModFailCondition.cs           |  2 +-
 osu.Game/Screens/Play/Player.cs                        | 10 +++-------
 osu.Game/Screens/Play/PlayerLoader.cs                  |  6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs b/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs
index f4732234a7..a7447a92cd 100644
--- a/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs
+++ b/osu.Game.Tests/Visual/Mods/TestSceneModFailCondition.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Mods
         protected override TestPlayer CreateModPlayer(Ruleset ruleset)
         {
             var player = base.CreateModPlayer(ruleset);
-            player.RestartRequested = _ => restartRequested = true;
+            player.PrepareLoaderForRestart = _ => restartRequested = true;
             return player;
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2d1f602832..cb24b99ce2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual bool PauseOnFocusLost => true;
 
-        public Action<bool> RestartRequested;
+        public Action<bool> PrepareLoaderForRestart;
 
         private bool isRestarting;
         private bool skipExitTransition;
@@ -719,12 +719,8 @@ namespace osu.Game.Screens.Play
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
             musicController.Stop();
 
-            if (RestartRequested != null)
-            {
-                skipExitTransition = quickRestart;
-                RestartRequested?.Invoke(quickRestart);
-                return true;
-            }
+            skipExitTransition = quickRestart;
+            PrepareLoaderForRestart?.Invoke(quickRestart);
 
             return PerformExit(quickRestart);
         }
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 0db96b71ad..d2ba5398e4 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -457,7 +457,7 @@ namespace osu.Game.Screens.Play
             CurrentPlayer = createPlayer();
             CurrentPlayer.Configuration.AutomaticallySkipIntro |= quickRestart;
             CurrentPlayer.RestartCount = restartCount++;
-            CurrentPlayer.RestartRequested = restartRequested;
+            CurrentPlayer.PrepareLoaderForRestart = prepareForRestart;
 
             LoadTask = LoadComponentAsync(CurrentPlayer, _ =>
             {
@@ -470,13 +470,11 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        private void restartRequested(bool quickRestartRequested)
+        private void prepareForRestart(bool quickRestartRequested)
         {
             quickRestart = quickRestartRequested;
             hideOverlays = true;
             ValidForResume = true;
-
-            this.MakeCurrent();
         }
 
         private void contentIn(double delayBeforeSideDisplays = 0)

From 53dce83b56b9c67657c5a8033016150e20c8e939 Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Sun, 1 Dec 2024 02:11:53 -0500
Subject: [PATCH 2/2] Fix restarting no longer working from results screen

Thanks to tests for pointing that out :blobsweat:
---
 osu.Game/Screens/Play/Player.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cb24b99ce2..3a0a0613f3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -722,6 +722,16 @@ namespace osu.Game.Screens.Play
             skipExitTransition = quickRestart;
             PrepareLoaderForRestart?.Invoke(quickRestart);
 
+            if (!this.IsCurrentScreen())
+            {
+                // if we're called externally (i.e. from results screen),
+                // use MakeCurrent to exit results screen as well as this player screen
+                // since ValidForResume = false in here
+                Debug.Assert(!ValidForResume);
+                this.MakeCurrent();
+                return true;
+            }
+
             return PerformExit(quickRestart);
         }