diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index 3a1587eeac..6d54779820 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -356,36 +356,44 @@ namespace BizHawk.Client.EmuHawk case "Do Search": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.DoSearch(); + else return false; break; case "New Search": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.NewSearch(); + else return false; break; case "Previous Compare To": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true); + else return false; break; case "Next Compare To": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.NextCompareTo(); + else return false; break; case "Previous Operator": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.NextOperator(reverse: true); + else return false; break; case "Next Operator": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.NextOperator(); + else return false; break; //TAStudio case "Add Branch": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AddBranchExternal(); + else return false; break; case "Delete Branch": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.RemoveBranchExtrenal(); + else return false; break; case "Show Cursor": if (GlobalWin.Tools.IsLoaded()) @@ -393,58 +401,72 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.TAStudio.SetVisibleIndex(); GlobalWin.Tools.TAStudio.RefreshDialog(); } + else return false; break; case "Toggle Follow Cursor": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true; + else return false; break; case "Toggle Auto-Restore": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true; + else return false; break; case "Toggle Turbo Seek": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true; + else return false; break; case "Clear Frames": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.ClearFramesExternal(); + else return false; break; case "Insert Frame": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.InsertFrameExternal(); + else return false; break; case "Delete Frames": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.DeleteFramesExternal(); + else return false; break; case "Clone Frames": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.CloneFramesExternal(); + else return false; break; case "Analog Increment": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AnalogIncrementByOne(); + else return false; break; case "Analog Decrement": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AnalogDecrementByOne(); + else return false; break; case "Analog Incr. by 10": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AnalogIncrementByTen(); + else return false; break; case "Analog Decr. by 10": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AnalogDecrementByTen(); + else return false; break; case "Analog Maximum": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AnalogMax(); + else return false; break; case "Analog Minimum": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.TAStudio.AnalogMin(); + else return false; break; // SNES