From 48c545a063c747b17412bd7423031d9983372be2 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Fri, 11 Apr 2025 06:45:06 -0700
Subject: [PATCH] Revert "don't reserve branch frame savestates"

This reverts commit 8d066ff29588fd0b6d6e87316ed5a63a7d4a163e.
---
 src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index f5426155a7..e27cfd5cc7 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -344,7 +344,8 @@ namespace BizHawk.Client.Common
 			// Why the frame before?
 			// because we always navigate to the frame before and emulate 1 frame so that we ensure a proper frame buffer on the screen
 			// users want instant navigation to markers, so to do this, we need to reserve the frame before the marker, not the marker itself
-			return Markers.Exists(m => m.Frame - 1 == frame);
+			return Markers.Exists(m => m.Frame - 1 == frame)
+				|| Branches.Any(b => b.Frame == frame); // Branches should already be in the reserved list, but it doesn't hurt to check
 		}
 
 		public void Dispose()