From 88d29148f92536135976a5918c81c1e8218e9d38 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 8 Oct 2013 19:21:00 +0000
Subject: [PATCH] lua - implement client.opentracelogger()

---
 BizHawk.MultiClient/MainForm.cs                   | 15 ++++++++++-----
 .../tools/Lua/LuaImplementation.cs                |  6 ++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 675af5d8d8..7c5532316c 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2768,13 +2768,18 @@ namespace BizHawk.MultiClient
 
 		public void LoadTraceLogger()
 		{
-			if (!TraceLogger1.IsHandleCreated || TraceLogger1.IsDisposed)
+			if (Global.Emulator.CoreComm.CpuTraceAvailable)
 			{
-				TraceLogger1 = new TraceLogger();
-				TraceLogger1.Show();
+				if (!TraceLogger1.IsHandleCreated || TraceLogger1.IsDisposed)
+				{
+					TraceLogger1 = new TraceLogger();
+					TraceLogger1.Show();
+				}
+				else
+				{
+					TraceLogger1.Focus();
+				}
 			}
-			else
-				TraceLogger1.Focus();
 		}
 
 		public void LoadToolBox()
diff --git a/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs b/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
index 53a1701862..c0cfcd74fb 100644
--- a/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
+++ b/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
@@ -66,6 +66,7 @@ namespace BizHawk.MultiClient
 			"openrom",
 			"opentasstudio",
 			"opentoolbox",
+			"opentracelogger",
 			"pause_av",
 			"reboot_core",
 			"screenheight",
@@ -602,6 +603,11 @@ namespace BizHawk.MultiClient
 			Global.MainForm.LoadToolBox();
 		}
 
+		public void client_opentracelogger()
+		{
+			Global.MainForm.LoadTraceLogger();
+		}
+
 		public void client_pause_av()
 		{
 			Global.MainForm.PauseAVI = true;