diff --git a/res/modules/internal/events.lua b/res/modules/internal/events.lua index 4820ddd5..7635af25 100644 --- a/res/modules/internal/events.lua +++ b/res/modules/internal/events.lua @@ -39,7 +39,7 @@ function events.emit(event, ...) local status, newres = xpcall(func, __vc__error, ...) if not status then debug.error("error in event ("..event..") handler: "..newres) - else + else result = result or newres end end diff --git a/src/logic/scripting/lua/lua_util.hpp b/src/logic/scripting/lua/lua_util.hpp index 75f30b54..280857e5 100644 --- a/src/logic/scripting/lua/lua_util.hpp +++ b/src/logic/scripting/lua/lua_util.hpp @@ -768,9 +768,12 @@ namespace lua { } inline std::string_view bytearray_as_string(lua::State* L, int idx) { - lua::requireglobal(L, "Bytearray_as_string"); lua::pushvalue(L, idx); + lua::requireglobal(L, "Bytearray_as_string"); + lua::pushvalue(L, -2); lua::call(L, 1, 1); - return lua::tolstring(L, -1); + auto view = lua::tolstring(L, -1); + lua::pop(L); + return view; } } diff --git a/src/network/Network.cpp b/src/network/Network.cpp index b3ff07cf..d8dc6185 100644 --- a/src/network/Network.cpp +++ b/src/network/Network.cpp @@ -379,7 +379,6 @@ public: } totalDownload += size; } - logger.debug() << "read " << size << " bytes from " << to_string(addr); } }