From 36c4dee7b8cc802933fab8845bf9ace79c0a7c5e Mon Sep 17 00:00:00 2001
From: rolanmen1 <rolanmen1@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 27 Mar 2012 03:34:21 +0000
Subject: [PATCH] Show Errors On Lua In The Output Box More Accurately

---
 BizHawk.MultiClient/tools/LuaConsole.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs
index 0652c9a5b0..d1eb174760 100644
--- a/BizHawk.MultiClient/tools/LuaConsole.cs
+++ b/BizHawk.MultiClient/tools/LuaConsole.cs
@@ -609,7 +609,7 @@ namespace BizHawk.MultiClient
 			}
 			catch (Exception ex)
 			{
-				if (ex.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:")
+				if (ex.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:" || ex.ToString().Substring(0, 26) == "LuaInterface.LuaException:")
 				{
 					AddText(ex.Message);
 				}
@@ -834,9 +834,15 @@ namespace BizHawk.MultiClient
 						s.FrameWaiting = result.WaitForFrame;
 					}
 				}
-				catch
+				catch (Exception ex)
 				{
-					MessageBox.Show("");
+                    if (ex.ToString().Substring(0, 32) == "LuaInterface.LuaScriptException:" || ex.ToString().Substring(0, 26) == "LuaInterface.LuaException:")
+                    {
+                        s.Enabled = false;
+                        AddText(ex.Message);
+                        UpdateNumberOfScripts();
+                    }
+                    else MessageBox.Show(ex.ToString());
 				}
 			}
 		}