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

Fix: TAStudio was still seeking after edits with "Auto restore" disabled and while unpaused. 

Fix: The bug where editing while seeking changed PauseOnFrame came back again.
This commit is contained in:
Suuper 2015-07-15 15:01:08 -05:00
parent 07a8a4c1d3
commit b9865db397
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -49,7 +49,11 @@ namespace BizHawk.Client.EmuHawk
if (Global.Emulator.Frame > CurrentTasMovie.LastValidFrame) if (Global.Emulator.Frame > CurrentTasMovie.LastValidFrame)
{ {
if (_autoRestorePaused == null) if (_autoRestorePaused == null)
{
_autoRestorePaused = GlobalWin.MainForm.EmulatorPaused; _autoRestorePaused = GlobalWin.MainForm.EmulatorPaused;
if (GlobalWin.MainForm.IsSeeking) // If seeking, do not shorten seek.
_autoRestoreFrame = GlobalWin.MainForm.PauseOnFrame;
}
GoToLastEmulatedFrameIfNecessary(CurrentTasMovie.LastValidFrame); GoToLastEmulatedFrameIfNecessary(CurrentTasMovie.LastValidFrame);
GlobalWin.MainForm.PauseOnFrame = _autoRestoreFrame; GlobalWin.MainForm.PauseOnFrame = _autoRestoreFrame;

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

@ -533,6 +533,7 @@ namespace BizHawk.Client.EmuHawk
if (_autoRestorePaused.HasValue && !_autoRestorePaused.Value) if (_autoRestorePaused.HasValue && !_autoRestorePaused.Value)
GlobalWin.MainForm.UnpauseEmulator(); GlobalWin.MainForm.UnpauseEmulator();
_autoRestorePaused = null; _autoRestorePaused = null;
GlobalWin.MainForm.PauseOnFrame = null; // Cancel seek to autorestore point
} }