From 56cc1fefffb6a8b33930c11593683f201202f340 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 18 Apr 2020 15:28:31 -0500
Subject: [PATCH] Tastudio - simplify movie loading stuff

---
 .../TAStudio/TAStudio.IControlMainForm.cs     |  2 +-
 .../tools/TAStudio/TAStudio.MenuItems.cs      |  2 +-
 .../tools/TAStudio/TAStudio.cs                | 29 ++++++-------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
index b07b5ab029..af5176f571 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
@@ -123,7 +123,7 @@ namespace BizHawk.Client.EmuHawk
 			if (AskSaveChanges())
 			{
 				WantsToControlStopMovie = false;
-				StartNewMovieWrapper(false);
+				StartNewMovieWrapper(CurrentTasMovie);
 				WantsToControlStopMovie = true;
 				RefreshDialog();
 			}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index fe32ca0dc7..a410015306 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -127,7 +127,7 @@ namespace BizHawk.Client.EmuHawk
 							MainForm.StartNewMovie(MovieService.Get(ofd.FileName), false);
 							ConvertCurrentMovieToTasproj();
 							_initialized = false;
-							StartNewMovieWrapper(false);
+							StartNewMovieWrapper(CurrentTasMovie);
 							SetUpColumns();
 							SetTextProperty();
 						}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 092abe9fcc..ddf374fce9 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -325,10 +325,10 @@ namespace BizHawk.Client.EmuHawk
 			if (MovieSession.Movie.IsActive() && !(MovieSession.Movie is TasMovie))
 			{
 				var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
-				if (result == DialogResult.OK)
+				if (result.IsOk())
 				{
 					ConvertCurrentMovieToTasproj();
-					StartNewMovieWrapper(false);
+					StartNewMovieWrapper(CurrentTasMovie);
 					SetUpColumns();
 				}
 				else
@@ -705,7 +705,7 @@ namespace BizHawk.Client.EmuHawk
 
 			MovieSession.Movie = tasMovie;
 
-			if (HandleMovieLoadStuff())
+			if (HandleMovieLoadStuff(tasMovie))
 			{
 				CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
 			}
@@ -720,22 +720,13 @@ namespace BizHawk.Client.EmuHawk
 			MarkerControl.Restart();
 			SetUpColumns();
 			RefreshDialog();
+			TasView.Refresh();
 		}
 
-		private bool HandleMovieLoadStuff(TasMovie movie = null)
+		private bool HandleMovieLoadStuff(TasMovie movie)
 		{
-			bool result;
 			WantsToControlStopMovie = false;
-
-			if (movie == null)
-			{
-				movie = CurrentTasMovie;
-				result = StartNewMovieWrapper(movie.InputLogLength == 0, movie);
-			}
-			else
-			{
-				result = StartNewMovieWrapper(false, movie);
-			}
+			var result = StartNewMovieWrapper(movie);
 
 			if (!result)
 			{
@@ -753,15 +744,13 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		private bool StartNewMovieWrapper(bool record, IMovie movie = null)
+		private bool StartNewMovieWrapper(TasMovie movie)
 		{
 			_initializing = true;
 
-			movie ??= CurrentTasMovie;
-			
-			SetTasMovieCallbacks(movie as TasMovie);
+			SetTasMovieCallbacks(movie);
 
-			bool result = MainForm.StartNewMovie(movie, record);
+			bool result = MainForm.StartNewMovie(movie, false);
 			if (result)
 			{
 				CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.