From 51df281d381386826d0e3fe0375401d4d641c5e9 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 14 Dec 2019 09:57:56 -0600
Subject: [PATCH] Tastudio - fix NRE when running a .tasproj through the normal
 movie system, making changes, then opening tastudio

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

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 55e374747c..6fa87657f3 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -104,7 +104,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				_autosaveTimer.Stop();
+				_autosaveTimer?.Stop();
 				GlobalWin.Sound.StopSound();
 				MessageStatusLabel.Text = "Saving...";
 				Cursor = Cursors.WaitCursor;
@@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 				CurrentTasMovie.Save();
 				if (Settings.AutosaveInterval > 0)
 				{
-					_autosaveTimer.Start();
+					_autosaveTimer?.Start();
 				}
 
 				MessageStatusLabel.Text = $"{CurrentTasMovie.Name} saved.";