Remove unnecessary duplicated actions in TAStudio

this should not change any behavior.
TASEmulators · Jul 6, 2024 · 4c39a81 · 4c39a81
1 parent d161215
commit 4c39a81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
@@ -94,7 +94,7 @@ protected override void FastUpdateAfter()
 
 		public override void Restart()
 		{
-			if (!IsHandleCreated || IsDisposed)
+			if (!IsActive)
 			{
 				return;
 			}
@@ -106,18 +106,15 @@ public override void Restart()
 
 			if (CurrentTasMovie != null)
 			{
-				if (Game.Hash != CurrentTasMovie.Hash || CurrentTasMovie.Filename != Settings.RecentTas.MostRecent)
+				TastudioStopMovie();
+				// try to load the most recent movie if it matches the currently loaded movie
+				if (Game.Hash == CurrentTasMovie.Hash && CurrentTasMovie.Filename == Settings.RecentTas.MostRecent)
 				{
-					TastudioStopMovie();
-					TasView.AllColumns.Clear();
-					StartNewTasMovie();
-					SetUpColumns();
-					TasView.Refresh();
+					LoadMostRecentOrStartNew();
 				}
 				else
 				{
-					TastudioStopMovie();
-					LoadMostRecentOrStartNew();
+					StartNewTasMovie();
 				}
 			}
 		}

diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -680,7 +680,6 @@ private bool LoadFileWithFallback(string path)
 
 			if (!movieLoadSucceeded)
 			{
-				TasView.AllColumns.Clear();
 				StartNewTasMovie();
 				_engaged = true;
 			}