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

Include the stack trace for errors in automation validation functions

This commit is contained in:
Thomas Goyne 2015-03-14 12:58:32 -08:00
parent ff874fadf9
commit ba9f5a78d4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/auto4_lua.cpp
View File

@ -713,20 +713,24 @@ namespace {
set_context(L, c);
// Error handler goes under the function to call
lua_pushcclosure(L, add_stack_trace, 0);
GetFeatureFunction("validate");
auto subsobj = new LuaAssFile(L, c->ass.get());
push_value(L, selected_rows(c));
if (auto active_line = c->selectionController->GetActiveLine())
push_value(L, active_line->Row + c->ass->Info.size() + c->ass->Styles.size() + 1);
else
lua_pushnil(L);
int err = lua_pcall(L, 3, 2, 0);
int err = lua_pcall(L, 3, 2, -5 /* three args, function, error handler */);
subsobj->ProcessingComplete();
if (err) {
wxLogWarning("Runtime error in Lua macro validation function:\n%s", get_wxstring(L, -1));
lua_pop(L, 1);
lua_pop(L, 2);
return false;
}
@ -738,7 +742,7 @@ namespace {
cmd_type |= cmd::COMMAND_DYNAMIC_HELP;
}
lua_pop(L, 2);
lua_pop(L, 3); // two return values and error handler
return result;
}