mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix stack check failure when a script fails to load in a debug build

Browse source
This commit is contained in:
Thomas Goyne 2012-08-19 20:32:18 -07:00
parent 1e030289ad
commit 4208fa362c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/auto4_lua.cpp
View file

@ -471,6 +471,7 @@ namespace Automation4 {
LuaScriptReader script_reader(GetFilename()); LuaScriptReader script_reader(GetFilename());
if (lua_load(L, script_reader.reader_func, &script_reader, GetPrettyFilename().utf8_str())) { 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)); 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)); throw ScriptLoadError(STD_STR(err));
} }
_stackcheck.check_stack(1); _stackcheck.check_stack(1);
@ -481,6 +482,7 @@ namespace Automation4 {
if (lua_pcall(L, 0, 0, 0)) { if (lua_pcall(L, 0, 0, 0)) {
// error occurred, assumed to be on top of Lua stack // 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)); 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)); throw ScriptLoadError(STD_STR(err));
} }
_stackcheck.check_stack(0); _stackcheck.check_stack(0);