ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lag Counter hotkey logic, and Tastudio depends on both IStatable and IInputPollable

This commit is contained in:
adelikat 2014-11-30 20:32:25 +00:00
parent a83d714c42
commit 05533c8562
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -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 =

7
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -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<TAStudio>();
}

2
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -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)
{