diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index f979a3dfa9..eebc6e734b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -375,7 +375,7 @@ namespace BizHawk.Client.EmuHawk Clipboard.SetDataObject(sb.ToString()); CurrentTasMovie.RemoveFrames(list); SetSplicer(); - TasView.DeselectAll(); + //TasView.DeselectAll(); feos: what if I want to continuously cut? if (needsToRollback) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index d76ef1a59f..683e1f56a3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -702,10 +702,13 @@ namespace BizHawk.Client.EmuHawk } else { - if (_autoRestorePaused.HasValue && !_autoRestorePaused.Value) - GlobalWin.MainForm.UnpauseEmulator(); + // feos: if we disable autorestore, we shouldn't ever get it paused + // moreover, this function is only called if we *were* paused, so the check makes no sense + //if (_autoRestorePaused.HasValue && !_autoRestorePaused.Value) + // GlobalWin.MainForm.UnpauseEmulator(); _autoRestorePaused = null; - GlobalWin.MainForm.PauseOnFrame = null; // Cancel seek to autorestore point + // feos: seek gets triggered by the previous function, so we don't wanna kill the seek frame before it ends + //GlobalWin.MainForm.PauseOnFrame = null; // Cancel seek to autorestore point } _autoRestoreFrame = null; }