From 318c1a7fea3eed3b9eb445c9ea40e1638d3f806c Mon Sep 17 00:00:00 2001 From: feos Date: Sun, 3 Jul 2022 00:00:41 +0300 Subject: [PATCH] tastudio: don't autorestore if current frame remained valid 1b8b4b492623f25b0aa322901c2009de9071ebb4 removed an important bit of logic that set `_triggerAutoRestore` to false in certain cases. but simply putting the same line back there doesn't fix the problem, probably due to major refactorings over the years. so I'm adding it right into `GoToLastEmulatedFrameIfNecessary()` which is still called properly when it's needed. `JumpToGreenzone()` is kinda redundant now since it contains the same check, but it's used from the outside, and I didn't feel like refactoring this part. --- .../tools/TAStudio/TAStudio.Navigation.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs index 7b49ef194a..ac0cf5d8a8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs @@ -22,6 +22,10 @@ namespace BizHawk.Client.EmuHawk GoToFrame(frame, false, false, OnLeftMouseDown); } + else + { + _triggerAutoRestore = false; + } } }