From 588eed44742e21cd5f6220ba4111adf87931340b Mon Sep 17 00:00:00 2001
From: kylethomson <kylethomson@gmail.com>
Date: Mon, 23 Jan 2012 00:20:23 +0000
Subject: [PATCH] Try again.

---
 BizHawk.MultiClient/MainForm.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index dff653b440..d28173a1a1 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -333,7 +333,10 @@ namespace BizHawk.MultiClient
 			for (; ; )
 			{
 				//client input-related duties
-           
+                if (LuaConsole1.LuaImp.isRunning)
+                {
+                    LuaConsole1.LuaImp.LuaWait.WaitOne();
+                }
 
 				Input.Instance.Update();
 				//handle events and dispatch as a hotkey action, or a hotkey button, or an input button
@@ -343,10 +346,7 @@ namespace BizHawk.MultiClient
 				Global.ActiveController.OR_FromLogical(Global.ClickyVirtualPadController);
 				Global.AutoFireController.LatchFromPhysical(Global.ControllerInputCoalescer);
 				Global.ClickyVirtualPadController.FrameTick();
-                if (LuaConsole1.LuaImp.isRunning)
-                {
-                    LuaConsole1.LuaImp.LuaWait.WaitOne();
-                }
+               
 				StepRunLoop_Core();
 				//if(!IsNullEmulator())
 				StepRunLoop_Throttle();
@@ -354,7 +354,7 @@ namespace BizHawk.MultiClient
 				Render();
                 if (LuaConsole1.LuaImp.isRunning)
                 {
-                    MainForm.MainWait.Set();
+                    Global.MainForm.MainWait.Set();
                 }
 				CheckMessages();
 				if (exit)