From 4208fa362c8e7cc74b2f3aedf361525ab186c3eb Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 19 Aug 2012 20:32:18 -0700 Subject: [PATCH] Fix stack check failure when a script fails to load in a debug build --- aegisub/src/auto4_lua.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index c99b9367a..e193fa50f 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -471,6 +471,7 @@ namespace Automation4 { LuaScriptReader script_reader(GetFilename()); if (lua_load(L, script_reader.reader_func, &script_reader, GetPrettyFilename().utf8_str())) { wxString err = wxString::Format("Error loading Lua script \"%s\":\n\n%s", GetPrettyFilename(), get_wxstring(L, -1)); + lua_pop(L, 1); throw ScriptLoadError(STD_STR(err)); } _stackcheck.check_stack(1); @@ -481,6 +482,7 @@ namespace Automation4 { if (lua_pcall(L, 0, 0, 0)) { // error occurred, assumed to be on top of Lua stack wxString err = wxString::Format("Error initialising Lua script \"%s\":\n\n%s", GetPrettyFilename(), get_wxstring(L, -1)); + lua_pop(L, 1); throw ScriptLoadError(STD_STR(err)); } _stackcheck.check_stack(0);