From 2599893b020e1b687063d93dc524be35a6ad3a3c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 18 Oct 2014 20:40:20 +0000
Subject: [PATCH] Tastudio - handle if user chooses stop movie in emuhawk

---
 .../tools/TAStudio/TAStudio.IControlMainForm.cs                 | 2 +-
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
index 5b3e8feb9d..e6726e47e9 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
@@ -13,7 +13,7 @@
 		public void StopMovie()
 		{
 			this.Focus();
-			//NewTasMenuItem_Click(null, null);
+			NewTasMenuItem_Click(null, null);
 		}
 
 		public bool WantsToControlRewind { get { return true; } }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index da9f0aef24..bb4f92e874 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -507,6 +507,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (AskSaveChanges())
 			{
+				WantsToControlStopMovie = false;
 				SaveConfigSettings();
 				GlobalWin.MainForm.StopMovie(saveChanges: false);
 				DisengageTastudio();