PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix error handling in events and runnables

Browse Source
This commit is contained in:
MihailRis 2024-12-31 10:25:26 +03:00
parent 3304bf27a6
commit 03a3062940
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/scripts/stdlib.lua
View File

@ -172,7 +172,10 @@ local __post_runnables = {}
function __process_post_runnables() function __process_post_runnables()
if #__post_runnables then if #__post_runnables then
for _, func in ipairs(__post_runnables) do for _, func in ipairs(__post_runnables) do
func() local status, result = pcall(func)
if not status then
debug.log("error in post_runnable: "..result)
end
end end
__post_runnables = {} __post_runnables = {}
end end

4
src/logic/scripting/lua/lua_engine.cpp
View File

@ -136,11 +136,13 @@ bool lua::emit_event(
getglobal(L, "events"); getglobal(L, "events");
getfield(L, "emit"); getfield(L, "emit");
pushstring(L, name); pushstring(L, name);
call_nothrow(L, args(L) + 1); if (call_nothrow(L, args(L) + 1)) {
bool result = toboolean(L, -1); bool result = toboolean(L, -1);
pop(L, 2); pop(L, 2);
return result; return result;
} }
return false;
}
State* lua::get_main_state() { State* lua::get_main_state() {
return main_thread; return main_thread;