From 5bd4f74ddf752f3ddc83d67d8ea48708a0248b13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 16:24:29 +0900
Subject: [PATCH 01/15] Fix a potential crash when exiting play during the
 results screen transition

---
 osu.Game/Screens/Play/Player.cs | 48 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5d06ac5b3a..dbee49b5dd 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -339,7 +339,7 @@ namespace osu.Game.Screens.Play
                     {
                         HoldToQuit =
                         {
-                            Action = performUserRequestedExit,
+                            Action = () => PerformExit(true),
                             IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                         },
                         PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
@@ -363,14 +363,14 @@ namespace osu.Game.Screens.Play
                     FailOverlay = new FailOverlay
                     {
                         OnRetry = Restart,
-                        OnQuit = performUserRequestedExit,
+                        OnQuit = () => PerformExit(true),
                     },
                     PauseOverlay = new PauseOverlay
                     {
                         OnResume = Resume,
                         Retries = RestartCount,
                         OnRetry = Restart,
-                        OnQuit = performUserRequestedExit,
+                        OnQuit = () => PerformExit(true),
                     },
                     new HotkeyExitOverlay
                     {
@@ -487,14 +487,30 @@ namespace osu.Game.Screens.Play
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
-            ValidForResume = false;
-
-            if (!this.IsCurrentScreen()) return;
+            if (!this.IsCurrentScreen())
+            {
+                // there is a chance that the exit was performed after the transition to results has started.
+                // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
+                ValidForResume = false;
+                this.MakeCurrent();
+            }
 
             if (userRequested)
-                performUserRequestedExit();
-            else
-                this.Exit();
+            {
+                if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
+                {
+                    failAnimation.FinishTransforms(true);
+                    return;
+                }
+
+                if (canPause)
+                {
+                    Pause();
+                    return;
+                }
+            }
+
+            this.Exit();
         }
 
         private void performUserRequestedSkip()
@@ -508,20 +524,6 @@ namespace osu.Game.Screens.Play
             updateSampleDisabledState();
         }
 
-        private void performUserRequestedExit()
-        {
-            if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
-            {
-                failAnimation.FinishTransforms(true);
-                return;
-            }
-
-            if (canPause)
-                Pause();
-            else
-                this.Exit();
-        }
-
         /// <summary>
         /// Restart gameplay via a parent <see cref="PlayerLoader"/>.
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>

From 61b9539864289b9ded799cac93187fc641c3db35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:14:16 +0900
Subject: [PATCH 02/15] Fix regression in quick exit logic

---
 osu.Game/Screens/Play/Player.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dbee49b5dd..3f8651761e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -478,11 +478,11 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Exits the <see cref="Player"/>.
         /// </summary>
-        /// <param name="userRequested">
-        /// Whether the exit is requested by the user, or a higher-level game component.
-        /// Pausing is allowed only in the former case.
+        /// <param name="showDialogFirst">
+        /// Whether the pause or fail dialog should be shown before performing an exit.
+        /// If true and a dialog is not yet displayed, the exit will be blocked the the relevant dialog will display instead.
         /// </param>
-        protected void PerformExit(bool userRequested)
+        protected void PerformExit(bool showDialogFirst)
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
@@ -495,7 +495,7 @@ namespace osu.Game.Screens.Play
                 this.MakeCurrent();
             }
 
-            if (userRequested)
+            if (showDialogFirst)
             {
                 if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
                 {
@@ -503,7 +503,7 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                if (canPause)
+                if (canPause && !GameplayClockContainer.IsPaused.Value)
                 {
                     Pause();
                     return;
@@ -540,10 +540,7 @@ namespace osu.Game.Screens.Play
             sampleRestart?.Play();
             RestartRequested?.Invoke();
 
-            if (this.IsCurrentScreen())
-                PerformExit(true);
-            else
-                this.MakeCurrent();
+            PerformExit(false);
         }
 
         private ScheduledDelegate completionProgressDelegate;

From cba116ff090c650cbc4812f16e15ddfd13747e3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:28:57 +0900
Subject: [PATCH 03/15] Fix incorrect call parameter for quick exit

---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3f8651761e..8a977b0498 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -379,7 +379,7 @@ namespace osu.Game.Screens.Play
                             if (!this.IsCurrentScreen()) return;
 
                             fadeOut(true);
-                            PerformExit(true);
+                            PerformExit(false);
                         },
                     },
                     failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },

From 2c052d70e8668bc9f64354fc14d3425b5f0e6552 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:29:18 +0900
Subject: [PATCH 04/15] Only trigger pause cooldown on pause (not exit)

---
 osu.Game/Screens/Play/Player.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8a977b0498..dda52f4dae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -505,6 +505,10 @@ namespace osu.Game.Screens.Play
 
                 if (canPause && !GameplayClockContainer.IsPaused.Value)
                 {
+                    if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
+                        // still want to block if we are within the cooldown period and not already paused.
+                        return;
+
                     Pause();
                     return;
                 }
@@ -808,14 +812,6 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
-            // ValidForResume is false when restarting
-            if (ValidForResume)
-            {
-                if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
-                    // still want to block if we are within the cooldown period and not already paused.
-                    return true;
-            }
-
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();

From 94f35825ddb28b8bf2d3e86562afc47dbd30e4a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:29:27 +0900
Subject: [PATCH 05/15] Update test to cover changed exit/pause logic

I think this makes more sense?
---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 46dd91710a..ae806883b0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -108,19 +108,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestExitTooSoon()
+        public void TestExitSoonAfterResumeSucceeds()
         {
             AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
 
             pauseAndConfirm();
             resume();
 
-            AddStep("exit too soon", () => Player.Exit());
+            AddStep("exit quick", () => Player.Exit());
 
             confirmClockRunning(true);
             confirmPauseOverlayShown(false);
 
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            AddAssert("exited", () => !Player.IsCurrentScreen());
         }
 
         [Test]

From a4dc54423531c77a0fb34023f8a634a9faaf108d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:23:59 +0900
Subject: [PATCH 06/15] Refactor some shared code in TestScenePause

---
 .../Visual/Gameplay/TestScenePause.cs         | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index ae806883b0..1a0b594bb7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -56,9 +56,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
             resume();
 
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             AddStep("click to resume", () => InputManager.Click(MouseButton.Left));
 
             confirmClockRunning(true);
@@ -73,9 +71,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
 
             resume();
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             pauseAndConfirm();
 
             AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
@@ -94,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestPauseTooSoon()
+        public void TestPauseDuringCooldownTooSoon()
         {
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
@@ -103,8 +99,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             resume();
             pause();
 
-            confirmClockRunning(true);
-            confirmPauseOverlayShown(false);
+            confirmResumed();
+            AddAssert("not exited", () => Player.IsCurrentScreen());
         }
 
         [Test]
@@ -117,9 +113,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("exit quick", () => Player.Exit());
 
-            confirmClockRunning(true);
-            confirmPauseOverlayShown(false);
-
+            confirmResumed();
             AddAssert("exited", () => !Player.IsCurrentScreen());
         }
 
@@ -133,9 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             pause();
 
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
 
             exitAndConfirm();
@@ -277,6 +269,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmPauseOverlayShown(false);
         }
 
+        private void confirmPausedWithNoOverlay()
+        {
+            confirmClockRunning(false);
+            confirmPauseOverlayShown(false);
+        }
+
         private void confirmExited()
         {
             AddUntilStep("player exited", () => !Player.IsCurrentScreen());

From 2b69c7b32530c4ab9ab712610b94664a2a9b9d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:00:30 +0900
Subject: [PATCH 07/15] Fix incorrect order of operation in pause blocking
 logic

---
 osu.Game/Screens/Play/Player.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dda52f4dae..c462786916 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -503,14 +503,17 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                if (canPause && !GameplayClockContainer.IsPaused.Value)
+                if (!GameplayClockContainer.IsPaused.Value)
                 {
-                    if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
-                        // still want to block if we are within the cooldown period and not already paused.
+                    // if we are within the cooldown period and not already paused, the operation should block completely.
+                    if (pauseCooldownActive)
                         return;
 
-                    Pause();
-                    return;
+                    if (canPause)
+                    {
+                        Pause();
+                        return;
+                    }
                 }
             }
 

From 25f5120fdf51be4ca58c208f55198cdcbcf41d0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:36:14 +0900
Subject: [PATCH 08/15] Add failing test coverage of user pausing or quick
 exiting during cooldown

---
 .../Visual/Gameplay/TestScenePause.cs         | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1a0b594bb7..8246e2c028 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,19 +90,47 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestPauseDuringCooldownTooSoon()
+        public void TestExternalPauseDuringCooldownTooSoon()
         {
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
             pauseAndConfirm();
 
             resume();
-            pause();
+            pauseExternally();
 
             confirmResumed();
             AddAssert("not exited", () => Player.IsCurrentScreen());
         }
 
+        [Test]
+        public void TestUserPauseDuringCooldownTooSoon()
+        {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            AddStep("pause via exit key", () => Player.ExitViaPause());
+
+            confirmResumed();
+            AddAssert("not exited", () => Player.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestQuickExitDuringCooldownTooSoon()
+        {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            AddStep("pause via exit key", () => Player.ExitViaQuickExit());
+
+            confirmResumed();
+            AddAssert("exited", () => !Player.IsCurrentScreen());
+        }
+
         [Test]
         public void TestExitSoonAfterResumeSucceeds()
         {
@@ -125,7 +153,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pause();
+            pauseExternally();
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -237,7 +265,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void pauseAndConfirm()
         {
-            pause();
+            pauseExternally();
             confirmPaused();
         }
 
@@ -286,7 +314,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
-        private void pause() => AddStep("pause", () => Player.Pause());
+        private void pauseExternally() => AddStep("pause", () => Player.Pause());
         private void resume() => AddStep("resume", () => Player.Resume());
 
         private void confirmPauseOverlayShown(bool isShown) =>
@@ -305,6 +333,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool PauseOverlayVisible => PauseOverlay.State.Value == Visibility.Visible;
 
+            public void ExitViaPause() => PerformExit(true);
+
+            public void ExitViaQuickExit() => PerformExit(false);
+
             public override void OnEntering(IScreen last)
             {
                 base.OnEntering(last);

From ec37e1602d566920601a1c197757991099b2447f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:02:58 +0900
Subject: [PATCH 09/15] Add failing test coverage of retrying from the results
 screen

---
 .../Visual/Navigation/OsuGameTestScene.cs     |  3 +++
 .../Navigation/TestSceneScreenNavigation.cs   | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index c5038068ec..96393cc4c3 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
@@ -115,6 +116,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 
+            public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
+
             // if we don't do this, when running under nUnit the version that gets populated is that of nUnit.
             public override string Version => "test game";
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 8480e6eaaa..d8380b2dd3 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Tests.Beatmaps.IO;
@@ -41,6 +43,30 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        [Test]
+        public void TestRetryFromResults()
+        {
+            Player player = null;
+            ResultsScreen results = null;
+
+            WorkingBeatmap beatmap() => Game.Beatmap.Value;
+
+            PushAndConfirm(() => new TestSongSelect());
+
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("set autoplay", () => Game.SelectedMods.Value = new[] { new OsuModAutoplay() });
+
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+            AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddStep("seek to end", () => beatmap().Track.Seek(beatmap().Track.Length));
+            AddUntilStep("wait for pass", () => (results = Game.ScreenStack.CurrentScreen as ResultsScreen) != null && results.IsLoaded);
+            AddStep("attempt to retry", () => results.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != player && Game.ScreenStack.CurrentScreen is Player);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestSongContinuesAfterExitPlayer(bool withUserPause)

From 1aea840504aa337e24173ca701188e6fd88a6d1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:03:41 +0900
Subject: [PATCH 10/15] Add missing return in early exit scenario (MakeCurrent
 isn't compatible with the following Exit)

---
 osu.Game/Screens/Play/Player.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c462786916..88ca516440 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -493,6 +493,7 @@ namespace osu.Game.Screens.Play
                 // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
                 ValidForResume = false;
                 this.MakeCurrent();
+                return;
             }
 
             if (showDialogFirst)

From 4f264758a499fea09585cdd9403cba15d9a7777c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:57:34 +0900
Subject: [PATCH 11/15] Add test coverage of pause from resume overlay

---
 .../Visual/Gameplay/TestScenePause.cs           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 8246e2c028..1ad1479cd4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -69,13 +69,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for hitobjects", () => Player.HealthProcessor.Health.Value < 1);
 
             pauseAndConfirm();
-
             resume();
+
             confirmPausedWithNoOverlay();
             pauseAndConfirm();
 
             AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
             confirmPaused();
+            confirmNotExited();
         }
 
         [Test]
@@ -100,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseExternally();
 
             confirmResumed();
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
         }
 
         [Test]
@@ -114,7 +115,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("pause via exit key", () => Player.ExitViaPause());
 
             confirmResumed();
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
         }
 
         [Test]
@@ -277,7 +278,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void exitAndConfirm()
         {
-            AddUntilStep("player not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
             AddStep("exit", () => Player.Exit());
             confirmExited();
             confirmNoTrackAdjustments();
@@ -286,7 +287,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void confirmPaused()
         {
             confirmClockRunning(false);
-            AddAssert("player not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
             AddAssert("player not failed", () => !Player.HasFailed);
             AddAssert("pause overlay shown", () => Player.PauseOverlayVisible);
         }
@@ -303,10 +304,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmPauseOverlayShown(false);
         }
 
-        private void confirmExited()
-        {
-            AddUntilStep("player exited", () => !Player.IsCurrentScreen());
-        }
+        private void confirmExited() => AddUntilStep("player exited", () => !Player.IsCurrentScreen());
+        private void confirmNotExited() => AddAssert("player not exited", () => Player.IsCurrentScreen());
 
         private void confirmNoTrackAdjustments()
         {

From 9cba350337484a3e1466063411daeb489c18abdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:57:21 +0900
Subject: [PATCH 12/15] Refactor again to better cover cases where the pause
 dialog should definitely be shown

---
 osu.Game/Screens/Play/Player.cs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 88ca516440..a844d3bcf7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -487,35 +487,30 @@ namespace osu.Game.Screens.Play
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
+            // there is a chance that the exit was performed after the transition to results has started.
+            // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
             if (!this.IsCurrentScreen())
             {
-                // there is a chance that the exit was performed after the transition to results has started.
-                // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
                 ValidForResume = false;
                 this.MakeCurrent();
                 return;
             }
 
-            if (showDialogFirst)
+            bool pauseDialogShown = PauseOverlay.State.Value == Visibility.Visible;
+
+            if (showDialogFirst && !pauseDialogShown)
             {
+                // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
                 if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
                 {
                     failAnimation.FinishTransforms(true);
                     return;
                 }
 
-                if (!GameplayClockContainer.IsPaused.Value)
-                {
-                    // if we are within the cooldown period and not already paused, the operation should block completely.
-                    if (pauseCooldownActive)
-                        return;
-
-                    if (canPause)
-                    {
-                        Pause();
-                        return;
-                    }
-                }
+                // in the case a dialog needs to be shown, attempt to pause and show it.
+                // this may fail (see internal checks in Pause()) at which point the exit attempt will be aborted.
+                Pause();
+                return;
             }
 
             this.Exit();

From f664fca0ddf2ac466af1d27048f0d370c74ecb94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 16:11:17 +0900
Subject: [PATCH 13/15] Tidy up tests (and remove duplicate with new call
 logic)

---
 .../Visual/Gameplay/TestScenePause.cs         | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1ad1479cd4..aa56c636ab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,20 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             resumeAndConfirm();
         }
 
-        [Test]
-        public void TestExternalPauseDuringCooldownTooSoon()
-        {
-            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
-
-            pauseAndConfirm();
-
-            resume();
-            pauseExternally();
-
-            confirmResumed();
-            confirmNotExited();
-        }
-
         [Test]
         public void TestUserPauseDuringCooldownTooSoon()
         {
@@ -112,7 +98,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
 
             resume();
-            AddStep("pause via exit key", () => Player.ExitViaPause());
+            pauseFromUserExitKey();
 
             confirmResumed();
             confirmNotExited();
@@ -154,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pauseExternally();
+            pauseFromUserExitKey();
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -266,7 +252,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void pauseAndConfirm()
         {
-            pauseExternally();
+            pauseFromUserExitKey();
             confirmPaused();
         }
 
@@ -313,7 +299,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
-        private void pauseExternally() => AddStep("pause", () => Player.Pause());
+        private void pauseFromUserExitKey() => AddStep("user pause", () => Player.ExitViaPause());
         private void resume() => AddStep("resume", () => Player.Resume());
 
         private void confirmPauseOverlayShown(bool isShown) =>

From 52ebe343473007a06436cfe4c3969a129ef6c287 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:15:38 +0900
Subject: [PATCH 14/15] Update TestScenePause exit from fail test to actually
 fail

---
 .../Visual/Gameplay/TestScenePause.cs         | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index aa56c636ab..1214a33084 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pauseFromUserExitKey();
+            AddStep("pause via forced pause", () => Player.Pause());
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -149,11 +149,28 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestExitFromFailedGameplay()
+        public void TestExitFromFailedGameplayAfterFailAnimation()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
-            AddStep("exit", () => Player.Exit());
+            AddUntilStep("wait for fail overlay shown", () => Player.FailOverlayVisible);
 
+            confirmClockRunning(false);
+
+            AddStep("exit via user pause", () => Player.ExitViaPause());
+            confirmExited();
+        }
+
+        [Test]
+        public void TestExitFromFailedGameplayDuringFailAnimation()
+        {
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+
+            // will finish the fail animation and show the fail/pause screen.
+            AddStep("attempt exit via pause key", () => Player.ExitViaPause());
+            AddAssert("fail overlay shown", () => Player.FailOverlayVisible);
+
+            // will actually exit.
+            AddStep("exit via pause key", () => Player.ExitViaPause());
             confirmExited();
         }
 

From 82cc06ca57d1b8ba63739799c7db5120cfe3ae7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:26:54 +0900
Subject: [PATCH 15/15] Fix new logic not considering fail overlay correctly

---
 osu.Game/Screens/Play/Player.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8f2c1d1b92..e4fc92b5f2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -496,12 +496,13 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            bool pauseDialogShown = PauseOverlay.State.Value == Visibility.Visible;
+            bool pauseOrFailDialogVisible =
+                PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible;
 
-            if (showDialogFirst && !pauseDialogShown)
+            if (showDialogFirst && !pauseOrFailDialogVisible)
             {
                 // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
-                if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
+                if (ValidForResume && HasFailed)
                 {
                     failAnimation.FinishTransforms(true);
                     return;