From 3f216fb4a4f5fca9d63f156c87252ef1c2c76bf8 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Mon, 21 Oct 2019 14:18:25 -0400 Subject: [PATCH] Disable cheats hotkey --- BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs | 2 ++ BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index f5d56cbd24..10fa9bdabe 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -348,6 +348,8 @@ // this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem"; + this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back))); + this.DisableAllCheatsMenuItem.ShortcutKeyDisplayString = "Ctrl + Backspace"; this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(233, 22); this.DisableAllCheatsMenuItem.Text = "Disable all"; this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click); diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index afb412e6f0..c53d2c9e8b 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -446,7 +446,8 @@ namespace BizHawk.Client.EmuHawk ToggleMenuItem.Enabled = SelectedIndices.Any(); - DisableAllCheatsMenuItem.Enabled = Global.CheatList.ActiveCount > 0; + // Always leave enabled even if no cheats enabled. This way the hotkey will always work however a new cheat is enabled + // DisableAllCheatsMenuItem.Enabled = Global.CheatList.ActiveCount > 0; GameGenieSeparator.Visible = OpenGameGenieEncoderDecoderMenuItem.Visible = @@ -553,7 +554,7 @@ namespace BizHawk.Client.EmuHawk } private void DisableAllCheatsMenuItem_Click(object sender, EventArgs e) - { + { Global.CheatList.DisableAll(); }