From 4c39a81228886f28200916bb6db1d248b2a52da8 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Sat, 6 Jul 2024 17:39:52 +0200
Subject: [PATCH] Remove unnecessary duplicated actions in TAStudio

this should not change any behavior.
---
 .../tools/TAStudio/TAStudio.IToolForm.cs          | 15 ++++++---------
 .../tools/TAStudio/TAStudio.cs                    |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
index 64bbada49b..6b6d6dd7b3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
@@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public override void Restart()
 		{
-			if (!IsHandleCreated || IsDisposed)
+			if (!IsActive)
 			{
 				return;
 			}
@@ -106,18 +106,15 @@ namespace BizHawk.Client.EmuHawk
 
 			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
index c485621f43..239bbaa10e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -680,7 +680,6 @@ namespace BizHawk.Client.EmuHawk
 
 			if (!movieLoadSucceeded)
 			{
-				TasView.AllColumns.Clear();
 				StartNewTasMovie();
 				_engaged = true;
 			}