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

ZwinderStateManager: don't erase states that should be reserved!

This commit is contained in:
SuuperW 2021-01-15 11:36:35 -06:00
parent 69af966a2d
commit 302cda6d17
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs
View File

@ -381,14 +381,18 @@ namespace BizHawk.Client.Common
// The user navigates to a frame after ancient interval 2, replay happens and we start filling gaps // The user navigates to a frame after ancient interval 2, replay happens and we start filling gaps
// Then the user, still without having made an edit, navigates to a frame before ancient interval 2, but after ancient interval 1 // Then the user, still without having made an edit, navigates to a frame before ancient interval 2, but after ancient interval 1
// Without this logic, we end up with out of order states // Without this logic, we end up with out of order states
// We cannot use InvalidateGaps because that does not address the state cache. // We cannot use InvalidateGaps because that does not address the state cache or check for reserved states.
for (int i = _gapFiller.Count - 1; i >= 0; i--) for (int i = _gapFiller.Count - 1; i >= 0; i--)
{ {
int lastGap = _gapFiller.GetState(i).Frame; var lastGap = _gapFiller.GetState(i);
if (lastGap < frame) if (lastGap.Frame < frame)
break; break;
StateCache.Remove(lastGap); if (_reserveCallback(lastGap.Frame))
AddToReserved(lastGap);
else
StateCache.Remove(lastGap.Frame);
_gapFiller.InvalidateEnd(i); _gapFiller.InvalidateEnd(i);
} }