From a7b3668506ba62c40fd455bf36d919b4c5d92bf8 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sun, 17 Apr 2016 18:54:55 +0300
Subject: [PATCH] tastudio: fix Used and fix a nasty mistake in branch logic.
 should properly handle branches created during seeking. fix #606 I hope.

---
 .../movie/tasproj/TasStateManager.cs            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index a0dc7d703d..806d0a4494 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -390,7 +390,7 @@ namespace BizHawk.Client.Common
 				if (BranchStates[frame][branch].IsOnDisk)
 					BranchStates[frame][branch].Dispose();
 				else
-					Used -= (ulong)BranchStates[frame][branch].Length;
+					//Used -= (ulong)BranchStates[frame][branch].Length;
 				BranchStates[frame].RemoveAt(BranchStates[frame].IndexOfKey(branch));
 
 				if (BranchStates[frame].Count == 0)
@@ -653,7 +653,10 @@ namespace BizHawk.Client.Common
 		private ulong _used;
 		private ulong Used
 		{
-			get { return _used; }
+			get
+			{
+				return _used;
+			}
 			set
 			{
 				if (value > 0xf000000000000000)
@@ -747,7 +750,7 @@ namespace BizHawk.Client.Common
 
 			// Loop through branch states for the given frame.
 			SortedList<int, StateManagerState> stateList = BranchStates[frame];
-			for (int i = 0; i < _movie.BranchCount; i++)
+			for (int i = 0; i < stateList.Count(); i++)
 			{
 				// Don't check the branch containing the state to match.
 				if (i == _movie.BranchIndexByHash(branchHash))
@@ -808,7 +811,7 @@ namespace BizHawk.Client.Common
 				SortedList<int, StateManagerState> stateList = kvp.Value;
 				if (stateList == null)
 					continue;
-
+				/*
 				if (stateList.ContainsKey(branchHash))
 				{
 					if (stateHasDuplicate(kvp.Key, branchHash) == -2)
@@ -817,7 +820,7 @@ namespace BizHawk.Client.Common
 							Used -= (ulong)stateList[branchHash].Length;
 					}
 				}
-
+				*/
 				stateList.Remove(branchHash);
 				if (stateList.Count == 0)
 					BranchStates.Remove(kvp.Key);
@@ -834,7 +837,7 @@ namespace BizHawk.Client.Common
 				SortedList<int, StateManagerState> stateList = kvp.Value;
 				if (stateList == null)
 					continue;
-
+				/*
 				if (stateList.ContainsKey(branchHash))
 				{
 					if (stateHasDuplicate(kvp.Key, branchHash) == -2)
@@ -843,7 +846,7 @@ namespace BizHawk.Client.Common
 							Used -= (ulong)stateList[branchHash].Length;
 					}
 				}
-
+				*/
 				stateList.Remove(branchHash);
 				if (stateList.Count == 0)
 					BranchStates.Remove(kvp.Key);