diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 4f01240c04..b6b03ffb5d 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -123,6 +123,7 @@ namespace BizHawk.Client.EmuHawk this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CancelSeekContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -841,6 +842,7 @@ namespace BizHawk.Client.EmuHawk this.SelectBetweenMarkersContextMenuItem, this.toolStripSeparator16, this.UngreenzoneContextMenuItem, + this.CancelSeekContextMenuItem, this.toolStripSeparator17, this.ClearContextMenuItem, this.DeleteFramesContextMenuItem, @@ -850,7 +852,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator18, this.TruncateContextMenuItem}); this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(273, 270); + this.RightClickMenu.Size = new System.Drawing.Size(273, 292); this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); // // SetMarkersContextMenuItem @@ -900,6 +902,13 @@ namespace BizHawk.Client.EmuHawk this.UngreenzoneContextMenuItem.Text = "Clear Greenzone"; this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); // + // CancelSeekContextMenuItem + // + this.CancelSeekContextMenuItem.Name = "CancelSeekContextMenuItem"; + this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(272, 22); + this.CancelSeekContextMenuItem.Text = "Cancel Seek"; + this.CancelSeekContextMenuItem.Click += new System.EventHandler(this.CancelSeekContextMenuItem_Click); + // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; @@ -1105,5 +1114,6 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripSeparator toolStripSeparator21; private System.Windows.Forms.ToolStripMenuItem DefaultStateSettingsMenuItem; private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.ToolStripMenuItem CancelSeekContextMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 0f53589241..a009ef80c9 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -691,5 +691,15 @@ namespace BizHawk.Client.EmuHawk } #endregion + + #region Context Menu + + private void CancelSeekContextMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.MainForm.PauseOnFrame = null; + TasView.Refresh(); + } + + #endregion } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index cff35b777a..25c76f55ce 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -613,6 +613,8 @@ namespace BizHawk.Client.EmuHawk TasView.SelectedRows.Any(); RemoveMarkersContextMenuItem.Enabled = CurrentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); // Disable the option to remove markers if no markers are selected (FCEUX does this). + + CancelSeekContextMenuItem.Enabled = GlobalWin.MainForm.PauseOnFrame.HasValue; } private void TAStudio_DragEnter(object sender, DragEventArgs e)