From 028c505fdc768d49ef763051bb1ee53d64581172 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 6 Sep 2015 14:56:12 -0400
Subject: [PATCH] Tastudio - clear marker and branch selections when starting a
 new project

---
 .../tools/TAStudio/BookmarksBranchesBox.cs               | 9 ++++++++-
 BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs   | 6 ++++++
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs        | 3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 3c47f1558a..5cc32076a0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -181,7 +181,14 @@ namespace BizHawk.Client.EmuHawk
 		public void UpdateValues()
 		{
 			BranchView.RowCount = Movie.BranchCount;
-            BranchView.Refresh();
+			BranchView.Refresh();
+		}
+
+		public void Restart()
+		{
+			BranchView.DeselectAll();
+			BranchView.RowCount = Movie.BranchCount;
+			BranchView.Refresh();
 		}
 
 		public void Branch()
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
index ed54f4856b..bb06bd652f 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -114,6 +114,12 @@ namespace BizHawk.Client.EmuHawk
 			MarkerView.Refresh();
 		}
 
+		public void Restart()
+		{
+			MarkerView.DeselectAll();
+			UpdateValues();
+		}
+
 		private void MarkerView_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			RemoveBtn.Enabled = MarkerView.SelectedRows.Any(i => i < Tastudio.CurrentTasMovie.Markers.Count);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index ee2b466bf7..c39779945a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -454,7 +454,8 @@ namespace BizHawk.Client.EmuHawk
 				HandleMovieLoadStuff();
 				CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
 
-				BookMarkControl.UpdateValues();
+				BookMarkControl.Restart();
+				MarkerControl.Restart();
 				RefreshDialog();
 			}
 		}