fixed back button bug

octopuscinema · Jun 4, 2024 · eb0c5f9 · eb0c5f9
1 parent fd02cf0
commit eb0c5f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Core/Error.cs b/Core/Error.cs
@@ -15,6 +15,7 @@ public enum Error
         BadImageData,
         BadFrameIndex,
         FrameNotReady,
+        FrameAlreadyReady,
         FrameRequestError,
         NotImplmeneted,
         SeekRequestAlreadyActive,

diff --git a/Core/Playback/PlaybackCinemaDNG.cs b/Core/Playback/PlaybackCinemaDNG.cs
@@ -235,7 +235,7 @@ public override Error RequestSeek(uint frame, bool force = false)
 
             // Nothing to do
             if (SeekFrame != null && SeekFrame.frameNumber == frame)
-                return Error.None;
+                return Error.FrameAlreadyReady;
 
             // If forced, wait for previous work to finish
             if ( SeekWork.IsBusy && !force)

diff --git a/UI/Common/Window/PlayerWindow.cs b/UI/Common/Window/PlayerWindow.cs
@@ -843,8 +843,12 @@ public void SliderSetValue(string id, double value)
 
             Playback.SeekStart();
             var frame = (uint)Math.Round(Playback.FirstFrame + (Playback.LastFrame - Playback.FirstFrame) * value);
-            Playback.RequestSeek(frame, true);
+            var seekResult = Playback.RequestSeek(frame, true);
             Playback.SeekEnd();
+
+            // Manually update playhead if seek failed for a sensible reason
+            if (seekResult == Error.FrameAlreadyReady)
+                playhead = (float)value;
         }
 
         private Error LoadCustomLUT(string lutPath)