From 29923329e9b2b5af0b32289b0eaa055fb3e32e52 Mon Sep 17 00:00:00 2001
From: "christoph.boehmwalder" <christoph.boehmwalder@gmail.com>
Date: Sat, 3 Jan 2015 03:30:34 +0000
Subject: [PATCH] Fix NullReferenceException when aborting TAStudio movie
 conversion while recording.

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

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index d7dc21d90d..5661e26783 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -556,6 +556,11 @@ namespace BizHawk.Client.EmuHawk
 		private void Tastudio_Load(object sender, EventArgs e)
 		{
 			InitializeOnLoad();
+			if(CurrentTasMovie == null) // dialog was aborted
+			{
+				Close();
+				return;
+			}
 			SetColumnsFromCurrentStickies();
 
 			if (VersionInfo.DeveloperBuild)
@@ -587,7 +592,6 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					Close();
 					return;
 				}
 			}