Merge 8e0f6fc12d into aa0ee5cf3a

Merge pull request #30970 from peppy/results-screen-quick-retry-transition
Fix quick retry transition from results screen
2024-12-05 10:33:22 +08:00 · 2024-12-04 10:23:34 -05:00 · 2024-12-04 07:12:38 -05:00 · 2024-12-04 06:31:14 -05:00 · 2024-12-04 14:31:39 +09:00
1 changed files with 5 additions and 1 deletions
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@ -55,6 +55,8 @@ namespace osu.Game.Screens.Ranking
        [Resolved]
        private Player? player { get; set; }

+        private bool skipExitTransition;
+
        [Resolved]
        private IAPIProvider api { get; set; } = null!;

@ -203,6 +205,7 @@ namespace osu.Game.Screens.Ranking
                    {
                        if (!this.IsCurrentScreen()) return;

+                        skipExitTransition = true;
                        player?.Restart(true);
                    },
                });
@ -313,7 +316,8 @@ namespace osu.Game.Screens.Ranking
            // HitObject references from HitEvent.
            Score?.HitEvents.Clear();

-            this.FadeOut(100);
+            if (!skipExitTransition)
+                this.FadeOut(100);
            return false;
        }
Author	SHA1	Message	Date
Salman Alshamrani	22c5125343	Merge `8e0f6fc12d` into `aa0ee5cf3a`	2024-12-04 10:23:34 -05:00
Salman Alshamrani	aa0ee5cf3a	Merge pull request #30970 from peppy/results-screen-quick-retry-transition Fix quick retry transition from results screen	2024-12-04 07:12:38 -05:00
Salman Alshamrani	a7586c52d0	Merge branch 'master' into results-screen-quick-retry-transition	2024-12-04 06:31:14 -05:00
Dean Herbert	a4d58648e2	Fix quick retry transition from results screen	2024-12-04 14:31:39 +09:00