From 4e6d190d48ec0c8d9228d6d0a05eb6dc1a9c3be4 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 19 Jul 2020 14:26:49 -0500
Subject: [PATCH] Tastudio - check MainForm.GameIsClosing in a better place

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

diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
index c17d3ade71..8778967953 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
@@ -76,10 +76,13 @@ namespace BizHawk.Client.EmuHawk
 
 		public void StopMovie(bool suppressSave)
 		{
-			Focus();
-			_suppressAskSave = suppressSave;
-			NewTasMenuItem_Click(null, null);
-			_suppressAskSave = false;
+			if (!MainForm.GameIsClosing)
+			{
+				Focus();
+				_suppressAskSave = suppressSave;
+				NewTasMenuItem_Click(null, null);
+				_suppressAskSave = false;
+			}
 		}
 
 		public bool WantsToControlRewind => true;
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 0691f535f8..f242cd98b5 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -79,13 +79,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void NewTasMenuItem_Click(object sender, EventArgs e)
 		{
-			if (!MainForm.GameIsClosing)
-			{
-				var prev = WantsToControlReboot;
-				WantsToControlReboot = false;
-				StartNewTasMovie();
-				WantsToControlReboot = prev;
-			}
+			var prev = WantsToControlReboot;
+			WantsToControlReboot = false;
+			StartNewTasMovie();
+			WantsToControlReboot = prev;
 		}
 
 		private void OpenTasMenuItem_Click(object sender, EventArgs e)