diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 5bd423d1c3..bbb6ac98f6 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -1911,7 +1911,13 @@ namespace BizHawk.Client.EmuHawk private void SetPauseStatusbarIcon() { - if (IsTurboSeeking) + if (EmulatorPaused) + { + PauseStatusButton.Image = Properties.Resources.Pause; + PauseStatusButton.Visible = true; + PauseStatusButton.ToolTipText = "Emulator Paused"; + } + else if (IsTurboSeeking) { PauseStatusButton.Image = Properties.Resources.Lightning; PauseStatusButton.Visible = true; @@ -1923,12 +1929,6 @@ namespace BizHawk.Client.EmuHawk PauseStatusButton.Visible = true; PauseStatusButton.ToolTipText = $"Emulator is playing to frame {PauseOnFrame.Value} click to stop seek"; } - else if (EmulatorPaused) - { - PauseStatusButton.Image = Properties.Resources.Pause; - PauseStatusButton.Visible = true; - PauseStatusButton.ToolTipText = "Emulator Paused"; - } else { PauseStatusButton.Image = Properties.Resources.Blank; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index de35d5b4bc..86604fe764 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -76,19 +76,22 @@ namespace BizHawk.Client.EmuHawk } } - private void StartSeeking(int? frame) + private void StartSeeking(int? frame, bool fromMiddleClick = false) { if (!frame.HasValue) { return; } - if (Mainform.PauseOnFrame != null) + if (!fromMiddleClick) { - StopSeeking(true); // don't restore rec mode just yet, as with heavy editing checkbox updating causes lag + if (Mainform.PauseOnFrame != null) + { + StopSeeking(true); // don't restore rec mode just yet, as with heavy editing checkbox updating causes lag + } + _seekStartFrame = Emulator.Frame; } - _seekStartFrame = Emulator.Frame; Mainform.PauseOnFrame = frame.Value; int? diff = Mainform.PauseOnFrame - _seekStartFrame; @@ -510,7 +513,7 @@ namespace BizHawk.Client.EmuHawk TasMovieRecord record = CurrentTasMovie[LastPositionFrame]; if (!record.Lagged.HasValue && LastPositionFrame > Emulator.Frame) { - StartSeeking(LastPositionFrame); + StartSeeking(LastPositionFrame, true); } else {