Skip to content

Commit 5e16676

Browse files
committed
Make TAStudio use the new return value of UnpauseEmulator, restore pausing behavior.
1 parent 22b963d commit 5e16676

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ public void GoToFrame(int frame, bool OnLeftMouseDown = false, bool skipLoadStat
1717
return;
1818
}
1919

20-
// Unpausing after a seek may seem like we aren't really seeking at all:
21-
// what is the significance of a seek to frame if we don't pause?
22-
// Answer: We use this in order to temporarily disable recording mode when the user navigates to a frame. (to avoid recording between whatever is the most recent state and the user-specified frame)
23-
// Other answer: turbo seek, navigating while unpaused
24-
_pauseAfterSeeking = MainForm.EmulatorPaused || (_seekingTo != -1 && _pauseAfterSeeking);
2520
WasRecording = CurrentTasMovie.IsRecording() || WasRecording;
2621
TastudioPlayMode();
2722

@@ -37,9 +32,13 @@ public void GoToFrame(int frame, bool OnLeftMouseDown = false, bool skipLoadStat
3732
_seekStartFrame = Emulator.Frame;
3833
_seekingByEdit = false;
3934

35+
// Unpausing after a seek may seem like we aren't really seeking at all:
36+
// what is the significance of a seek to frame if we don't pause?
37+
// Answer: We use this in order to temporarily disable recording mode when the user navigates to a frame. (to avoid recording between whatever is the most recent state and the user-specified frame)
38+
// Other answer: turbo seek, navigating while unpaused
39+
_pauseAfterSeeking = MainForm.UnpauseEmulator() || (_seekingTo != -1 && _pauseAfterSeeking);
4040
_seekingTo = frame;
4141
MainForm.PauseOnFrame = int.MaxValue; // This being set is how MainForm knows we are seeking, and controls TurboSeek.
42-
MainForm.UnpauseEmulator();
4342

4443
if (_seekingTo - _seekStartFrame > 1)
4544
{

0 commit comments

Comments
 (0)