Merge branch 'master' into master

2026-05-28 10:30:22 +08:00 · 2024-10-14 17:48:04 +09:00
parent 0664b185c3 120eb9adea
commit 8ff86d560f
1 changed files with 13 additions and 1 deletions
@@ -455,7 +455,19 @@ namespace osu.Game.Screens.Play
            MetadataInfo.Loading = true;

            content.FadeInFromZero(500, Easing.OutQuint);
-            content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
+
+            if (quickRestart)
+            {
+                prepareNewPlayer();
+                content.ScaleTo(1, 650, Easing.OutQuint);
+            }
+            else
+            {
+                content
+                    .ScaleTo(1, 650, Easing.OutQuint)
+                    .Then()
+                    .Schedule(prepareNewPlayer);
+            }

            using (BeginDelayedSequence(delayBeforeSideDisplays))
            {