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

Tastudio - when editing while seeking, continue to seek to the originally intended frame

This commit is contained in:
adelikat 2014-10-23 23:14:32 +00:00
parent 7be7f3aba6
commit 5c4a876d2d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,10 +466,19 @@ namespace BizHawk.Client.EmuHawk
if (_triggerAutoRestore) if (_triggerAutoRestore)
{ {
GoToLastEmulatedFrameIfNecessary(_triggerAutoRestoreFromFrame.Value); GoToLastEmulatedFrameIfNecessary(_triggerAutoRestoreFromFrame.Value);
if (GlobalWin.MainForm.PauseOnFrame.HasValue &&
_autoRestoreFrame.HasValue &&
_autoRestoreFrame < GlobalWin.MainForm.PauseOnFrame) // If we are already seeking to a later frame don't shorten that journey here
{
_autoRestoreFrame = GlobalWin.MainForm.PauseOnFrame;
}
DoAutoRestore(); DoAutoRestore();
_triggerAutoRestore = false; _triggerAutoRestore = false;
_triggerAutoRestoreFromFrame = null; _triggerAutoRestoreFromFrame = null;
} }
} }