From 88a70e407ca2ce9805177f88f18ae073acb77265 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2017 20:11:41 +0900
Subject: [PATCH 1/2] Fix and simplifty pause logic

Resolves #770
---
 osu.Game/Screens/Play/Player.cs | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8ee0de12b9..68fbbaddcc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play
 
         public Action RestartRequested;
 
-        public bool IsPaused => !decoupledClock.IsRunning;
+        public bool IsPaused { get; private set; }
 
         internal override bool AllowRulesetChange => false;
 
@@ -264,19 +264,18 @@ namespace osu.Game.Screens.Play
         {
             if (!canPause && !force) return;
 
-            // the actual pausing is potentially happening on a different thread.
-            // we want to wait for the source clock to stop so we can be sure all components are in a stable state.
-            if (!IsPaused)
-            {
-                decoupledClock.Stop();
+            if (IsPaused) return;
 
-                Schedule(() => Pause(force));
-                return;
-            }
+            // stop the decoupled clock (stops the audio eventually)
+            decoupledClock.Stop();
+
+            // stop processing updatess on the offset clock (instantly freezes time for all our components)
+            offsetClock.ProcessSourceClockFrames = false;
+
+            IsPaused = true;
 
             // we need to do a final check after all of our children have processed up to the paused clock time.
-            // this is to cover cases where, for instance, the player fails in the last processed frame (which would change canPause).
-            // as the scheduler runs before children updates, let's schedule for the next frame.
+            // this is to cover cases where, for instance, the player fails in the current processing frame.
             Schedule(() =>
             {
                 if (!canPause) return;
@@ -291,6 +290,11 @@ namespace osu.Game.Screens.Play
 
         public void Resume()
         {
+            if (!IsPaused) return;
+
+            IsPaused = false;
+            offsetClock.ProcessSourceClockFrames = true;
+
             lastPauseActionTime = Time.Current;
             hudOverlay.KeyCounter.IsCounting = true;
             hudOverlay.Progress.Hide();

From d1f85c3f8e6dc4982a731b51073b2b948fdafa35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2017 23:21:23 +0900
Subject: [PATCH 2/2] Update framework

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 67f3958036..f8e5b10f68 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 67f39580365f7d0a42f8788eae2b60881dde1c67
+Subproject commit f8e5b10f6883af83ffbc431b03fe4ee3e89797a6