diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index a9232d0315..e33e3407ab 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1104,7 +1104,7 @@ namespace BizHawk.Client.EmuHawk TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings; TraceLoggerMenuItem.Enabled = Global.Emulator.CoreComm.CpuTraceAvailable; - TAStudioMenuItem.Enabled = Global.Emulator.HasSavestates(); + TAStudioMenuItem.Enabled = Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput(); CheatsMenuItem.Enabled = HexEditorMenuItem.Enabled = diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index 137e228075..eff7717179 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -54,7 +54,10 @@ namespace BizHawk.Client.EmuHawk ToggleFrameCounter(); break; case "Lag Counter": - ToggleLagCounter(); + if (Global.Emulator.CanPollInput()) + { + ToggleLagCounter(); + } break; case "Input Display": ToggleInputDisplay(); @@ -315,7 +318,7 @@ namespace BizHawk.Client.EmuHawk } break; case "TAStudio": - if (Global.Emulator.HasSavestates()) + if (Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput()) { GlobalWin.Tools.Load(); } diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 58d2cb9267..7524c6bbc9 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -95,7 +95,7 @@ namespace BizHawk.Client.EmuHawk NesDebuggerToolbarItem.Visible = VersionInfo.DeveloperBuild && Global.Emulator.SystemId == "NES"; - TAStudioToolbarItem.Visible = Global.Emulator.HasSavestates(); + TAStudioToolbarItem.Visible = Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput(); foreach (var button in ToolBoxItems) {