From 2409d03974e4975b15c9ab0df6146d047a775e4d Mon Sep 17 00:00:00 2001
From: kylelyk <kylelyk@gmail.com>
Date: Sat, 23 Aug 2014 20:17:06 +0000
Subject: [PATCH] Fixed TasMovie not loading on TAStudio startup.

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

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
index d4a5c92360..10010bcaab 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
@@ -12,6 +12,11 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
+			if (_currentTasMovie == null)
+			{
+				return;
+			}
+
 			if (_currentTasMovie.IsRecording)
 			{
 				TasView.LastVisibleIndex = _currentTasMovie.InputLogLength - 1;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 665508eb58..49e1a3e9c3 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -97,8 +97,8 @@ namespace BizHawk.Client.EmuHawk
 		private void NewTasMovie()
 		{
 			Global.MovieSession.Movie = new TasMovie();
-			_currentTasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
 			_currentTasMovie = Global.MovieSession.Movie as TasMovie;
+			_currentTasMovie.PropertyChanged += new PropertyChangedEventHandler(this.TasMovie_OnPropertyChanged);
 			_currentTasMovie.Filename = DefaultTasProjName(); // TODO don't do this, take over any mainform actions that can crash without a filename
 			_currentTasMovie.PopulateWithDefaultHeaderValues();
 			_currentTasMovie.ClearChanges();