From 918fbe6367650407c97f2352aaf06bf604645dae Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 18 Apr 2020 15:37:43 -0500
Subject: [PATCH] fix Tastudio .tasproj loading broken in previous commits
 (this code is a mess), MovieSession - remove setter on Movie property

---
 BizHawk.Client.Common/movie/MovieSession.cs             | 2 +-
 BizHawk.Client.Common/movie/interfaces/IMovieSession.cs | 2 +-
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 946259e503..8d31dfde28 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -38,7 +38,7 @@ namespace BizHawk.Client.Common
 			Movie = MovieService.DefaultInstance;
 		}
 
-		public IMovie Movie { get; set; }
+		public IMovie Movie { get; private set; }
 		public bool ReadOnly { get; set; } = true;
 		public bool NewMovieQueued => _queuedMovie != null;
 		public string QueuedSyncSettings => _queuedMovie.SyncSettingsJson;
diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
index 28df9210ff..d29a1ec8fb 100644
--- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
+++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -5,7 +5,7 @@ namespace BizHawk.Client.Common
 {
 	public interface IMovieSession
 	{
-		IMovie Movie { get; set; }
+		IMovie Movie { get; }
 		bool ReadOnly { get; set; }
 
 		/// <summary>
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index ddf374fce9..c5c955bfd0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -703,8 +703,6 @@ namespace BizHawk.Client.EmuHawk
 			SetTasMovieCallbacks(tasMovie);
 			tasMovie.ClearChanges(); // Don't ask to save changes here.
 
-			MovieSession.Movie = tasMovie;
-
 			if (HandleMovieLoadStuff(tasMovie))
 			{
 				CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
@@ -750,7 +748,9 @@ namespace BizHawk.Client.EmuHawk
 
 			SetTasMovieCallbacks(movie);
 
+			SuspendLayout();
 			bool result = MainForm.StartNewMovie(movie, false);
+			ResumeLayout();
 			if (result)
 			{
 				CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.