diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 789beba5c2..a31d6b90dc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -830,7 +830,14 @@ namespace BizHawk.Client.EmuHawk if (Emulator.Frame > frame) { - GoToLastEmulatedFrameIfNecessary(frame); + if ((MainForm.EmulatorPaused || _seekingTo == -1) + && !CurrentTasMovie.LastPositionStable) + { + RestorePositionFrame = Emulator.Frame; + CurrentTasMovie.LastPositionStable = true; // until new frame is emulated + } + + GoToFrame(frame); if (Settings.AutoRestoreLastPosition && RestorePositionFrame != -1) { StartSeeking(RestorePositionFrame); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs index 296040cc3e..1d5f735e66 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs @@ -79,27 +79,6 @@ namespace BizHawk.Client.EmuHawk } } - /// - /// Only goes to go to the frame if it is an event before current emulation, otherwise it is just a future event that can freely be edited - /// - private void GoToLastEmulatedFrameIfNecessary(int frame, bool OnLeftMouseDown = false) - { - if (frame != Emulator.Frame) // Don't go to a frame if you are already on it! - { - if (frame <= Emulator.Frame) - { - if ((MainForm.EmulatorPaused || _seekingTo == -1) - && !CurrentTasMovie.LastPositionStable) - { - RestorePositionFrame = Emulator.Frame; - CurrentTasMovie.LastPositionStable = true; // until new frame is emulated - } - - GoToFrame(frame, false, false, OnLeftMouseDown); - } - } - } - public void GoToPreviousMarker() { if (Emulator.Frame > 0)