Merge pull request #30905 from peppy/fix-multiple-offset-applications

Clear previous `LastLocalUserScore` when returning to song select
ppy · Nov 28, 2024 · 0777199 · 0777199
2 parents d218c19 + c26c84b
commit 0777199
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -354,6 +354,23 @@ public void TestRetryCountIncrements()
             AddAssert("retry count is 1", () => player.RestartCount == 1);
         }
 
+        [Test]
+        public void TestLastScoreNullAfterExitingPlayer()
+        {
+            AddUntilStep("wait for last play null", getLastPlay, () => Is.Null);
+
+            var getOriginalPlayer = playToCompletion();
+
+            AddStep("attempt to retry", () => getOriginalPlayer().ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for last play matches player", getLastPlay, () => Is.EqualTo(getOriginalPlayer().Score.ScoreInfo));
+
+            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != getOriginalPlayer() && Game.ScreenStack.CurrentScreen is Player);
+            AddStep("exit player", () => (Game.ScreenStack.CurrentScreen as Player)?.Exit());
+            AddUntilStep("wait for last play null", getLastPlay, () => Is.Null);
+
+            ScoreInfo getLastPlay() => Game.Dependencies.Get<SessionStatics>().Get<ScoreInfo>(Static.LastLocalUserScore);
+        }
+
         [Test]
         public void TestRetryImmediatelyAfterCompletion()
         {

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
@@ -10,6 +10,7 @@
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Configuration
 {
@@ -77,7 +78,8 @@ public enum Static
         TouchInputActive,
 
         /// <summary>
-        /// Stores the local user's last score (can be completed or aborted).
+        /// Contains the local user's last score (can be completed or aborted) after exiting <see cref="Player"/>.
+        /// Will be cleared to <c>null</c> when leaving <see cref="PlayerLoader"/>.
         /// </summary>
         LastLocalUserScore,
 

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -28,6 +28,7 @@
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Performance;
+using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Skinning;
@@ -78,6 +79,8 @@ public partial class PlayerLoader : ScreenWithBeatmapBackground
         private FillFlowContainer disclaimers = null!;
         private OsuScrollContainer settingsScroll = null!;
 
+        private Bindable<ScoreInfo?> lastScore = null!;
+
         private Bindable<bool> showStoryboards = null!;
 
         private bool backgroundBrightnessReduction;
@@ -179,6 +182,8 @@ private void load(SessionStatics sessionStatics, OsuConfigManager config)
         {
             muteWarningShownOnce = sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce);
             batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce);
+            lastScore = sessionStatics.GetBindable<ScoreInfo?>(Static.LastLocalUserScore);
+
             showStoryboards = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
 
             const float padding = 25;
@@ -347,6 +352,8 @@ public override bool OnExiting(ScreenExitEvent e)
             highPerformanceSession?.Dispose();
             highPerformanceSession = null;
 
+            lastScore.Value = null;
+
             return base.OnExiting(e);
         }