iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Use the custom lua error handler during macro load

This commit is contained in:
Thomas Goyne 2015-02-15 08:10:26 -08:00
parent 878fd4453b
commit 5cedf16edd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/auto4_lua.cpp
View File

@ -465,15 +465,19 @@ namespace {
} }
stackcheck.check_stack(1); stackcheck.check_stack(1);
// Insert our error handler under the user's script
lua_pushcclosure(L, add_stack_trace, 0);
lua_insert(L, -2);
// and execute it // and execute it
// this is where features are registered // this is where features are registered
// don't thread this, as there's no point in it and it seems to break on wx 2.8.3, for some reason if (lua_pcall(L, 0, 0, -2)) {
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
description = agi::format("Error initialising Lua script \"%s\":\n\n%s", GetPrettyFilename().string(), get_string_or_default(L, -1)); description = agi::format("Error initialising Lua script \"%s\":\n\n%s", GetPrettyFilename().string(), get_string_or_default(L, -1));
lua_pop(L, 1); lua_pop(L, 2); // error + error handler
return; return;
} }
lua_pop(L, 1); // error handler
stackcheck.check_stack(0); stackcheck.check_stack(0);
lua_getglobal(L, "version"); lua_getglobal(L, "version");