From aeccf2e3100acdb7499b5c990765ae42151bc6db Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Sat, 25 Jul 2015 16:36:36 -0400
Subject: [PATCH] Tastudio Branches - Fix null reference excepting when
 navigating after branch load

---
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index ef38490239..c25a55943b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -487,8 +487,10 @@ namespace BizHawk.Client.EmuHawk
 			_floatEditYPos = -1;
 			_leftButtonHeld = false;
 
-			if (_floatEditRow == -1)
+			if (_floatEditRow == -1 && CurrentTasMovie.ChangeLog != null)
+			{
 				CurrentTasMovie.ChangeLog.EndBatch();
+			}
 		}
 
 		private void TasView_MouseUp(object sender, MouseEventArgs e)