From d3af111a5ef7b2f66ef61e0988e50892c84521e2 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 27 Jul 2014 02:38:21 +0000
Subject: [PATCH] tastudio - when engaging and disengaging tastudio, clear out
 the PauseOnFrame property

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

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 85ed37c4e7..8a3d2a76e5 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -149,6 +149,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void EngageTastudio()
 		{
+			GlobalWin.MainForm.PauseOnFrame = null;
 			GlobalWin.OSD.AddMessage("TAStudio engaged");
 			_tas = Global.MovieSession.Movie as TasMovie;
 			GlobalWin.MainForm.PauseEmulator();
@@ -163,6 +164,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DisengageTastudio()
 		{
+			GlobalWin.MainForm.PauseOnFrame = null;
 			GlobalWin.OSD.AddMessage("TAStudio disengaged");
 			Global.MovieSession.Movie = MovieService.DefaultInstance;
 			GlobalWin.MainForm.TakeControl();