From ea826973d687c3734550061adcfca36d6ad8d091 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 15 Oct 2014 19:18:51 +0000
Subject: [PATCH] don't autoload tastudio if user didn't autoload (or cmd line)
 a rom

---
 BizHawk.Client.EmuHawk/MainForm.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index d90ccfbc8c..8824785c71 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -387,7 +387,7 @@ namespace BizHawk.Client.EmuHawk
 				GlobalWin.Tools.Load<GBGPUView>();
 			}
 
-			if (Global.Config.AutoloadTAStudio)
+			if (Global.Config.AutoloadTAStudio && !Global.Game.IsNullInstance)
 			{
 				GlobalWin.Tools.Load<TAStudio>();
 			}