diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index c776afe9ab..28d6b4c8b5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1181,6 +1181,7 @@ namespace BizHawk.Client.EmuHawk this.MinimumSize = new System.Drawing.Size(200, 148); this.Name = "TAStudio"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Activated += new System.EventHandler(this.TAStudio_Activated); this.Deactivate += new System.EventHandler(this.TAStudio_Deactivate); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing); this.Load += new System.EventHandler(this.Tastudio_Load); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index b7ddb20d4c..85befc1d1c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -972,6 +972,13 @@ namespace BizHawk.Client.EmuHawk toolTip1.SetToolTip(TasView, null); } + private void TAStudio_Activated(object sender, EventArgs e) + { + // The copy/paste shortcut keys are handled by the right-click context menu, not EmuHawk hotkeys. + // So they will only work if TasView is focused. + TasView.Select(); + } + private void TAStudio_Deactivate(object sender, EventArgs e) { if (_leftButtonHeld)