From 13476f33ca9d3efee4e699a6523d48b53fee8d2d Mon Sep 17 00:00:00 2001 From: feos Date: Mon, 1 Aug 2016 20:23:16 +0300 Subject: [PATCH] tastudio: don't pass ctrl+c hotkey to mainform. --- BizHawk.Client.Common/tools/Interfaces/IToolForm.cs | 1 + BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/BizHawk.Client.Common/tools/Interfaces/IToolForm.cs b/BizHawk.Client.Common/tools/Interfaces/IToolForm.cs index 728c44deb0..9d1bedf96d 100644 --- a/BizHawk.Client.Common/tools/Interfaces/IToolForm.cs +++ b/BizHawk.Client.Common/tools/Interfaces/IToolForm.cs @@ -37,6 +37,7 @@ //Necessary winform calls bool Focus(); + bool ContainsFocus { get; } void Show(); void Close(); bool IsDisposed { get; } diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index a9411f72fe..d17896d774 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -43,6 +43,11 @@ namespace BizHawk.Client.EmuHawk TakeScreenshot(); break; case "Screen Raw to Clipboard": + // Ctrl+C clash. any tool that has such acc must check this. + // maybe check if mainform has focus instead? + if (GlobalWin.Tools.IsLoaded()) + if (GlobalWin.Tools.Get().ContainsFocus) + break; TakeScreenshotToClipboard(); break; case "Screen Client to Clipboard":