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

TASEdit - fix frame advance button

This commit is contained in:
andres.delikat 2012-03-16 15:27:45 +00:00
parent 40ca3e1616
commit c55e863b15
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BizHawk.MultiClient/MainForm.cs
View File

@ -1616,10 +1616,10 @@ namespace BizHawk.MultiClient
double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds; double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds;
bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta; bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta;
if (Global.Emulator.IsLagFrame && frameProgressTimeElapsed && Global.Config.SkipLagFrame) if (Global.Emulator.IsLagFrame && frameProgressTimeElapsed && Global.Config.SkipLagFrame)
{ {
Global.Emulator.FrameAdvance(true); Global.Emulator.FrameAdvance(true);
} }
if (Global.ClientControls["Frame Advance"] || PressFrameAdvance) if (Global.ClientControls["Frame Advance"] || PressFrameAdvance)
{ {
@ -1652,11 +1652,11 @@ namespace BizHawk.MultiClient
} }
FrameAdvanceTimestamp = DateTime.MinValue; FrameAdvanceTimestamp = DateTime.MinValue;
} }
if (!EmulatorPaused) if (!EmulatorPaused)
{ {
runFrame = true; runFrame = true;
} }
if (Global.Config.RewindEnabled && Global.ClientControls["Rewind"] || PressRewind) if (Global.Config.RewindEnabled && Global.ClientControls["Rewind"] || PressRewind)
{ {
@ -1674,8 +1674,8 @@ namespace BizHawk.MultiClient
#if WINDOWS #if WINDOWS
if (LuaConsole1.IsRunning()) if (LuaConsole1.IsRunning())
{ {
Global.MainForm.MainWait.Set(); Global.MainForm.MainWait.Set();
LuaConsole1.WaitOne(); LuaConsole1.WaitOne();
} }
#endif #endif
@ -1782,6 +1782,7 @@ namespace BizHawk.MultiClient
Global.AutoFireController.IncrementStarts(); Global.AutoFireController.IncrementStarts();
} }
PressFrameAdvance = false;
} }
if (genSound) if (genSound)