From 539deaaf6cf8488b2fd7e1a1c890d36187ccf647 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 9 Jul 2014 22:44:20 +0000
Subject: [PATCH] TAStudio - fix autoload

---
 .../tools/TAStudio/TAStudio.cs                | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index a6d6043cca..848b61f7ef 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -145,6 +145,7 @@ namespace BizHawk.Client.EmuHawk
 			EngageTastudio();
 			SetUpColumns();
 			LoadConfigSettings();
+			RefreshDialog();
 		}
 
 		private void ConvertCurrentMovieToTasproj()
@@ -187,8 +188,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (AskSave())
 			{
-				GlobalWin.MainForm.StartNewMovie(_tas, record: true);
-				TasView.ItemCount = _tas.InputLogLength;
+				GlobalWin.MainForm.StartNewMovie(_tas, record: false);
+				RefreshDialog();
 			}
 		}
 
@@ -196,19 +197,21 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (AskSave())
 			{
-				NewTasMovie();
-				_tas.Filename = path;
+				var movie = new TasMovie
+				{
+					Filename = path
+				};
 
-				var loadResult = Global.MovieSession.MovieLoad();
-				if (!loadResult)
+				var file = new FileInfo(path);
+				if (!file.Exists)
 				{
 					ToolHelpers.HandleLoadError(Global.Config.RecentTas, path);
 				}
-				else
-				{
-					Global.Config.RecentTas.Add(path);
-					RefreshDialog();
-				}
+
+				GlobalWin.MainForm.StartNewMovie(movie, record: false);
+				_tas = Global.MovieSession.Movie as TasMovie;
+				Global.Config.RecentTas.Add(path);
+				RefreshDialog();
 			}
 		}
 
@@ -351,7 +354,7 @@ namespace BizHawk.Client.EmuHawk
 					_tas.Filename = file.FullName;
 					_tas.Load();
 					Global.Config.RecentTas.Add(_tas.Filename);
-					TasView.ItemCount = _tas.InputLogLength;
+					RefreshDialog();
 					MessageStatusLabel.Text = Path.GetFileName(_tas.Filename) + " loaded.";
 				}
 			}