From 1d687c470cc83ef7a68e79e0191c120faccb1fd0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Feb 2018 18:49:07 +0900
Subject: [PATCH] Fix clock not incrementing beyond last frame of replay

---
 .../Rulesets/Replays/FramedReplayInputHandler.cs   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 913214abfb..c245407bbf 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -102,8 +102,14 @@ protected Vector2? Position
 
             if (hasFrames)
             {
-                //if we changed frames, we want to execute once *exactly* on the frame's time.
-                if (currentDirection == time.CompareTo(NextFrame.Time) && advanceFrame())
+                // check if the next frame is in the "future" for the current playback direction
+                if (currentDirection != time.CompareTo(NextFrame.Time))
+                {
+                    // if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
+                    if (inImportantSection)
+                        return null;
+                }
+                else if (advanceFrame())
                 {
                     // If going backwards, we need to execute once _before_ the frame time to reverse any judgements
                     // that would occur as a result of this frame in forward playback
@@ -111,10 +117,6 @@ protected Vector2? Position
                         return currentTime = CurrentFrame.Time - 1;
                     return currentTime = CurrentFrame.Time;
                 }
-
-                //if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
-                if (inImportantSection)
-                    return null;
             }
 
             return currentTime = time;