From 0c3da629c8a4aaec09cb754b3545764e350fe888 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Tue, 13 Dec 2016 22:37:06 -0500
Subject: [PATCH] Fix for exception in marker window

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

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
index c49f75ef31..ba6a7a5f4b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -52,8 +52,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void MarkerView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
 		{
-			var prev = Markers.PreviousOrCurrent(Emulator.Frame);//Temp fix
+			var prev = Markers.PreviousOrCurrent(0);
 
+			if (this.Emulator!=null) //Temp fix
+				prev = Markers.PreviousOrCurrent(Emulator.Frame);
+				
 			if (prev != null && index == Markers.IndexOf(prev))
 			{
 				color = TAStudio.Marker_FrameCol;