From 40cf573368c0e513427512f495cb0c1f0ca68347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jun 2019 23:15:58 +0900
Subject: [PATCH 1/3] Fix pause not correctly showing pause screen

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8c2c653c5b..957498dc44 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play
                         if (!this.IsCurrentScreen()) return;
 
                         fadeOut(true);
-                        performUserRequestedExit();
+                        performImmediateExit();
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, }
@@ -251,15 +251,20 @@ namespace osu.Game.Screens.Play
             return working;
         }
 
-        private void performUserRequestedExit()
+        private void performImmediateExit()
         {
-            if (!this.IsCurrentScreen()) return;
-
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             onCompletionEvent = null;
 
             ValidForResume = false;
 
+            performUserRequestedExit();
+        }
+
+        private void performUserRequestedExit()
+        {
+            if (!this.IsCurrentScreen()) return;
+
             this.Exit();
         }
 

From a4214db39ea1e710eaee14332fa2b5a77ce91fd6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jun 2019 23:48:42 +0900
Subject: [PATCH 2/3] Add test for pause via hold

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index ac10c77a78..97a4a90c33 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
@@ -137,6 +138,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             exitAndConfirm();
         }
 
+        [Test]
+        public void TestExitViaHoldToExit()
+        {
+            AddStep("exit", () =>
+            {
+                InputManager.MoveMouseTo(Player.HUDOverlay.HoldToQuit.First(c => c is HoldToConfirmContainer));
+                InputManager.PressButton(MouseButton.Left);
+            });
+
+            confirmPaused();
+
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            exitAndConfirm();
+        }
+
         [Test]
         public void TestExitFromPause()
         {

From c04f14a1e34c3740eea750f50e912b74efc0c249 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jun 2019 00:23:39 +0900
Subject: [PATCH 3/3] Remove unused using statement

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 97a4a90c33..5808a78056 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;