From 9433a977479792bc35b470ca8720e446df69c8cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Mar 2019 14:40:53 +0900
Subject: [PATCH] Add resume requesting support and fix exit scenarios

---
 osu.Game/Rulesets/UI/RulesetContainer.cs |  7 ++++++
 osu.Game/Screens/Play/Player.cs          | 27 ++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetContainer.cs b/osu.Game/Rulesets/UI/RulesetContainer.cs
index d8813631dc..c522118962 100644
--- a/osu.Game/Rulesets/UI/RulesetContainer.cs
+++ b/osu.Game/Rulesets/UI/RulesetContainer.cs
@@ -130,6 +130,13 @@ namespace osu.Game.Rulesets.UI
         /// <returns>The input manager.</returns>
         public abstract PassThroughInputManager CreateInputManager();
 
+        /// <summary>
+        /// Invoked when the interactive user requests resuming from a paused state.
+        /// Allows potentially delaying the resume process until an interaction is performed.
+        /// </summary>
+        /// <param name="continueResume">The action to run when resuming is to be completed.</param>
+        public void RequestResume(Action continueResume) => continueResume();
+
         protected virtual ReplayInputHandler CreateReplayInputHandler(Replay replay) => null;
 
         protected FrameStabilityContainer FrameStabilityContainer;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 018ff900ee..b53ed8ae17 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -352,8 +352,10 @@ namespace osu.Game.Screens.Play
             && !HasFailed
             // cannot pause if already paused (and not in the process of resuming)
             && (GameplayClockContainer.IsPaused.Value == false || IsResuming)
-            // cannot pause too soon after previous pause
-            && (!lastPauseActionTime.HasValue || GameplayClockContainer.GameplayClock.CurrentTime >= lastPauseActionTime + pause_cooldown);
+            && (!pauseCooldownActive || IsResuming);
+
+        private bool pauseCooldownActive =>
+            lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
 
         private bool canResume =>
             // cannot resume from a non-paused state
@@ -376,6 +378,7 @@ namespace osu.Game.Screens.Play
         {
             if (!canPause) return;
 
+            IsResuming = false;
             GameplayClockContainer.Stop();
             PauseOverlay.Show();
             lastPauseActionTime = GameplayClockContainer.GameplayClock.CurrentTime;
@@ -385,12 +388,20 @@ namespace osu.Game.Screens.Play
         {
             if (!canResume) return;
 
-            //todo: add resume request support to ruleset
             IsResuming = true;
-
-            GameplayClockContainer.Start();
             PauseOverlay.Hide();
-            IsResuming = false;
+
+            // time-based conditions may allow instant resume.
+            if (GameplayClockContainer.GameplayClock.CurrentTime < Beatmap.Value.Beatmap.HitObjects.First().StartTime)
+                completeResume();
+            else
+                RulesetContainer.RequestResume(completeResume);
+
+            void completeResume()
+            {
+                GameplayClockContainer.Start();
+                IsResuming = false;
+            }
         }
 
         #endregion
@@ -445,6 +456,10 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
+            if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
+                // still want to block if we are within the cooldown period and not already paused.
+                return true;
+
             GameplayClockContainer.ResetLocalAdjustments();
 
             fadeOut();