From 0a4ad42eaa7ddde65230f1d455d094dd08950c15 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 6 Sep 2015 13:39:14 -0400
Subject: [PATCH] TasStateManager - more work arounds to deal with the scenario
 of removing branches, I doubt this is the correct approach, but I don't know
 what else to do, someone should revisit this

---
 BizHawk.Client.Common/movie/tasproj/TasStateManager.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 20819d4eaa..5d4aeff04a 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -768,7 +768,12 @@ namespace BizHawk.Client.Common
 					stateList = new SortedList<int, tsmState>();
 					BranchStates[kvp.Key] = stateList;
 				}
-				stateList.Add(branches, kvp.Value);
+
+				// adelikat: More key checking, needed for these steps:  new project, add frames, branch, add frames, branch, add frames, branch, remove first branch, add frames, branch
+				if (!stateList.ContainsKey(branches))
+				{
+					stateList.Add(branches, kvp.Value);
+				}
 			}
 			branches++;
 			currentBranch = branches;