From f28fa497955e332dca0fdae57c08c98ed10b01b3 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:59:42 +0200
Subject: [PATCH] Fix ZwinderBuffer InvalidateAfter logic

- should resolve #4074

- fixes 2d229be6ba26d3c30c9e055ba89a1d67e5e7b010 for when _firstStateIndex != 0
---
 src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs b/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
index 79d9b2fe1c..a64141f567 100644
--- a/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
+++ b/src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
@@ -293,7 +293,7 @@ namespace BizHawk.Client.Common
 			{
 				if (_states[i].Frame > frame)
 				{
-					_nextStateIndex = (i + _firstStateIndex) & STATEMASK;
+					_nextStateIndex = i;
 					return true;
 				}
 			}