From 099e37ad76aeeca4d44a4061f60e4998e8fdc636 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sun, 22 Nov 2015 17:17:01 +0300
Subject: [PATCH] tastudio: load session and rebuild columns on every file
 load. it was only loaded on tastudio launch, so whenever it's not autoloading
 a recent project, loading one with different syncSettings would cause !
 columns.

---
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 1e5f174bb5..38b0b26e7f 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -237,9 +237,6 @@ namespace BizHawk.Client.EmuHawk
 				BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance;
 			}
 
-			GoToFrame(CurrentTasMovie.Session.CurrentFrame);
-			CurrentTasMovie.CurrentBranch = CurrentTasMovie.Session.CurrentBranch;
-
 			////////////////
 
 			RefreshDialog();
@@ -435,6 +432,10 @@ namespace BizHawk.Client.EmuHawk
 
 			if (!HandleMovieLoadStuff(newMovie))
 				return false;
+
+			SetUpColumns();
+			GoToFrame(CurrentTasMovie.Session.CurrentFrame);
+			CurrentTasMovie.CurrentBranch = CurrentTasMovie.Session.CurrentBranch;
 			
 			// clear all selections
 			TasView.DeselectAll();