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

Tastudio - when navigating to a "future" frame, don't seek if you didn't need to (can happen when navigating to a marker that is one frame after the inputlog length)

This commit is contained in:
adelikat 2014-09-28 17:34:47 +00:00
parent a2762d708e
commit c775cca820
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -377,14 +377,17 @@ namespace BizHawk.Client.EmuHawk
LoadState(_currentTasMovie[_currentTasMovie.LastEmulatedFrame].State.ToArray());
}
GlobalWin.MainForm.UnpauseEmulator();
if (Global.Config.TAStudioAutoPause && frame < _currentTasMovie.InputLogLength)
if (frame != Global.Emulator.Frame) // If we aren't already at our destination, seek
{
GlobalWin.MainForm.PauseOnFrame = _currentTasMovie.InputLogLength;
}
else
{
GlobalWin.MainForm.PauseOnFrame = frame;
GlobalWin.MainForm.UnpauseEmulator();
if (Global.Config.TAStudioAutoPause && frame < _currentTasMovie.InputLogLength)
{
GlobalWin.MainForm.PauseOnFrame = _currentTasMovie.InputLogLength;
}
else
{
GlobalWin.MainForm.PauseOnFrame = frame;
}
}
}