From 78b03cbdec910a46a5c3d05d82bde97c7db70234 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 8 Aug 2020 10:49:12 -0500 Subject: [PATCH] remember to set pauseInterrupted = false, when responding to said flag. Use TasView mouse leave instead of form leave for leave logic, since form leave doesn't fire if you move your mouse too fast because winforms is bad. This fixes #2275 and #2258 --- .../tools/TAStudio/TAStudio.Designer.cs | 1 - src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 48fac7447c..352fdcf692 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1195,7 +1195,6 @@ namespace BizHawk.Client.EmuHawk this.Load += new System.EventHandler(this.Tastudio_Load); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper); - this.MouseLeave += new System.EventHandler(this.TAStudio_MouseLeave); this.TASMenu.ResumeLayout(false); this.TASMenu.PerformLayout(); this.TasStatusStrip.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index bbf279914a..cb17cd58fa 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -137,6 +137,7 @@ namespace BizHawk.Client.EmuHawk BookMarkControl.LoadedCallback = BranchLoaded; BookMarkControl.SavedCallback = BranchSaved; BookMarkControl.RemovedCallback = BranchRemoved; + TasView.MouseLeave += TAStudio_MouseLeave; } private void Tastudio_Load(object sender, EventArgs e) @@ -1007,7 +1008,8 @@ namespace BizHawk.Client.EmuHawk if (_playbackInterrupted) { - MainForm.UnpauseEmulator(); + MainForm.UnpauseEmulator(); + _playbackInterrupted = false; } }