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

Repair the mental damage with ZwinderStateManager having a method called HasState that doesn't actually tell you whether it has a state 

Reverts commit 4a58ff2a0c and instead updates ZwinderStateManager to use what apparently is the correct (?) way to tell whether a state is had.
This commit is contained in:
nattthebear 2021-01-16 19:26:06 -05:00
parent c218cf302f
commit 7204eeb533
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,7 +469,7 @@ namespace BizHawk.Client.Common
public bool HasState(int frame) public bool HasState(int frame)
{ {
return StateCache.Contains(frame); return GetStateClosestToFrame(frame).Key == frame;
} }
private bool InvalidateGaps(int frame) private bool InvalidateGaps(int frame)

5
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -788,10 +788,10 @@ namespace BizHawk.Client.EmuHawk
{ {
MainForm.FrameAdvance(); MainForm.FrameAdvance();
byte[] greenZone = CurrentTasMovie.TasStateManager[Emulator.Frame]; if (CurrentTasMovie.TasStateManager.HasState(Emulator.Frame))
if (greenZone.Length > 0)
{ {
byte[] state = StatableEmulator.CloneSavestate(); byte[] state = StatableEmulator.CloneSavestate();
byte[] greenZone = CurrentTasMovie.TasStateManager[Emulator.Frame];
if (!state.SequenceEqual(greenZone)) if (!state.SequenceEqual(greenZone))
{ {
@ -805,7 +805,6 @@ namespace BizHawk.Client.EmuHawk
File.WriteAllBytes(path, greenZone); File.WriteAllBytes(path, greenZone);
} }
} }
return; return;
} }