diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index ddceabf662..1ab512462b 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -328,51 +328,66 @@ namespace BizHawk.Client.EmuHawk // Ram Search case "Do Search": - GlobalWin.Tools.RamSearch.DoSearch(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.RamSearch.DoSearch(); break; case "New Search": - GlobalWin.Tools.RamSearch.NewSearch(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.RamSearch.NewSearch(); break; case "Previous Compare To": - GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true); break; case "Next Compare To": - GlobalWin.Tools.RamSearch.NextCompareTo(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.RamSearch.NextCompareTo(); break; case "Previous Operator": - GlobalWin.Tools.RamSearch.NextOperator(reverse: true); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.RamSearch.NextOperator(reverse: true); break; case "Next Operator": - GlobalWin.Tools.RamSearch.NextOperator(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.RamSearch.NextOperator(); break; //TAStudio case "Add Branch": - GlobalWin.Tools.TAStudio.AddBranchExternal(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.AddBranchExternal(); break; case "Delete Branch": - GlobalWin.Tools.TAStudio.RemoveBranchExtrenal(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.RemoveBranchExtrenal(); break; case "Toggle Follow Cursor": - GlobalWin.Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true; + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true; break; case "Toggle Auto-Restore": - GlobalWin.Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true; + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true; break; case "Toggle Turbo Seek": - GlobalWin.Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true; + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true; break; case "Clear Frames": - GlobalWin.Tools.TAStudio.ClearFramesExternal(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.ClearFramesExternal(); break; case "Insert Frame": - GlobalWin.Tools.TAStudio.InsertFrameExternal(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.InsertFrameExternal(); break; case "Delete Frames": - GlobalWin.Tools.TAStudio.DeleteFramesExternal(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.DeleteFramesExternal(); break; case "Clone Frames": - GlobalWin.Tools.TAStudio.CloneFramesExternal(); + if (GlobalWin.Tools.IsLoaded()) + GlobalWin.Tools.TAStudio.CloneFramesExternal(); break; // SNES