From 38e75421ab663e63343b9d1121541c2358d1b2b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Mar 2019 02:21:34 +0900
Subject: [PATCH 1/2] Fix HoldForMenuButton getting stuck in a confirming state

Closes #4446.
---
 .../Screens/Play/HUD/HoldForMenuButton.cs     | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index ca4cce8929..8bef15a9f1 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -92,30 +92,6 @@ private class Button : HoldToConfirmContainer, IKeyBindingHandler<GlobalAction>
             public Action HoverGained;
             public Action HoverLost;
 
-            public bool OnPressed(GlobalAction action)
-            {
-                switch (action)
-                {
-                    case GlobalAction.Back:
-                        BeginConfirm();
-                        return true;
-                }
-
-                return false;
-            }
-
-            public bool OnReleased(GlobalAction action)
-            {
-                switch (action)
-                {
-                    case GlobalAction.Back:
-                        AbortConfirm();
-                        return true;
-                }
-
-                return false;
-            }
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
@@ -178,7 +154,7 @@ protected override void Confirm()
                 // avoid starting a new confirm call until we finish animating.
                 pendingAnimation = true;
 
-                Progress.Value = 0;
+                AbortConfirm();
 
                 overlayCircle.ScaleTo(0, 100)
                              .Then().FadeOut().ScaleTo(1).FadeIn(500)
@@ -207,6 +183,32 @@ protected override void OnHoverLost(HoverLostEvent e)
                 base.OnHoverLost(e);
             }
 
+            public bool OnPressed(GlobalAction action)
+            {
+                switch (action)
+                {
+                    case GlobalAction.Back:
+                        if (!pendingAnimation)
+                            BeginConfirm();
+                        return true;
+                }
+
+                return false;
+            }
+
+            public bool OnReleased(GlobalAction action)
+            {
+                switch (action)
+                {
+                    case GlobalAction.Back:
+                        AbortConfirm();
+                        return true;
+                }
+
+                return false;
+            }
+
+
             protected override bool OnMouseDown(MouseDownEvent e)
             {
                 if (!pendingAnimation && e.CurrentState.Mouse.Buttons.Count() == 1)

From 1be4c7b813d423360d25e3eef3de857add501ded Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Mar 2019 02:23:23 +0900
Subject: [PATCH 2/2] Fix excess newline

---
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 8bef15a9f1..50bc34726a 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -208,7 +208,6 @@ public bool OnReleased(GlobalAction action)
                 return false;
             }
 
-
             protected override bool OnMouseDown(MouseDownEvent e)
             {
                 if (!pendingAnimation && e.CurrentState.Mouse.Buttons.Count() == 1)