BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix error sometimes not displaying when failing inside global event handler

Browse Source
This commit is contained in:
Lion Kortlepel 2022-10-03 14:38:19 +02:00
parent d63c84286e
commit 658b37acac
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/TLuaEngine.cpp
View File

@ -417,7 +417,6 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
if (Fn.valid()) { if (Fn.valid()) {
auto LuaResult = Fn(EventArgs); auto LuaResult = Fn(EventArgs);
auto Result = std::make_shared<TLuaResult>(); auto Result = std::make_shared<TLuaResult>();
Result->Ready = true;
if (LuaResult.valid()) { if (LuaResult.valid()) {
Result->Error = false; Result->Error = false;
Result->Result = LuaResult; Result->Result = LuaResult;
@ -425,6 +424,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
Result->Error = true; Result->Error = true;
Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid"; Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
} }
Result->Ready = true;
Return.push_back(Result); Return.push_back(Result);
} }
} }
@ -948,15 +948,14 @@ void TLuaEngine::StateThreadData::operator()() {
} }
sol::state_view StateView(mState); sol::state_view StateView(mState);
auto Res = StateView.safe_script(*S.first.Content, sol::script_pass_on_error, S.first.FileName); auto Res = StateView.safe_script(*S.first.Content, sol::script_pass_on_error, S.first.FileName);
S.second->Ready = true;
if (Res.valid()) { if (Res.valid()) {
S.second->Error = false; S.second->Error = false;
S.second->Result = std::move(Res); S.second->Result = std::move(Res);
} else { } else {
S.second->Error = true; S.second->Error = true;
sol::error Err = Res; S.second->ErrorMessage = std::string(sol::error(Res).what());
S.second->ErrorMessage = Err.what();
} }
S.second->Ready = true;
} }
} }
{ // StateFunctionQueue Scope { // StateFunctionQueue Scope