From fd2e6848f10c3bcd5ce0a56b86647bb183e21692 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sat, 24 Oct 2015 16:29:37 +0300
Subject: [PATCH] tastudio: tsm never actually uses currentBranch, so why
 should it have it? Revert "make sln version 2010 again." This reverts commit
 48a59f1cefd5fd96df24d616e04ced60210a68a2. It's now known that to make newer
 .sln compatible to VS2010, one should install SP1.

---
 .../movie/tasproj/TasStateManager.cs                  | 11 -----------
 BizHawk.sln                                           |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index bbcb401beb..a8798ced03 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -586,7 +586,6 @@ namespace BizHawk.Client.Common
 
 		public void SaveBranchStates(BinaryWriter bw)
 		{
-			bw.Write(currentBranch);
 			if (Settings.BranchStatesInTasproj)
 			{
 				bw.Write(BranchStates.Count);
@@ -605,7 +604,6 @@ namespace BizHawk.Client.Common
 
 		public void LoadBranchStates(BinaryReader br)
 		{
-			currentBranch = br.ReadInt32();
 			if (Settings.BranchStatesInTasproj)
 			{
 				try
@@ -705,7 +703,6 @@ namespace BizHawk.Client.Common
 		#region "Branches"
 
 		private SortedList<int, SortedList<int, StateManagerState>> BranchStates = new SortedList<int, SortedList<int, StateManagerState>>();
-		private int currentBranch = -1;
 
 		/// <summary>
 		/// Checks if the state at frame in the given branch (-1 for current) has any duplicates.
@@ -782,7 +779,6 @@ namespace BizHawk.Client.Common
 				stateList.Add(branchHash, kvp.Value);
 				Used += (ulong)stateList[branchHash].Length;
 			}
-			currentBranch = _movie.BranchCount;
 		}
 
 		public void RemoveBranch(int index)
@@ -810,10 +806,6 @@ namespace BizHawk.Client.Common
 				if (stateList.Count == 0)
 					BranchStates.Remove(kvp.Key);
 			}
-			if (currentBranch > index)
-				currentBranch--;
-			else if (currentBranch == index)
-				currentBranch = -1;
 		}
 
 		public void UpdateBranch(int index)
@@ -859,7 +851,6 @@ namespace BizHawk.Client.Common
 				stateList.Add(branchHash, kvp.Value);
 				Used += (ulong)stateList[branchHash].Length;
 			}
-			currentBranch = index;
 		}
 
 		public void LoadBranch(int index)
@@ -876,8 +867,6 @@ namespace BizHawk.Client.Common
 				if (kvp.Value.ContainsKey(branchHash))
 					SetState(kvp.Key, kvp.Value[branchHash].State);
 			}
-
-			currentBranch = index;
 		}
 
 		#endregion
diff --git a/BizHawk.sln b/BizHawk.sln
index 5b474fcd49..c95daded65 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"