diff --git a/src/TConsole.cpp b/src/TConsole.cpp index e7b5a98..5cca537 100644 --- a/src/TConsole.cpp +++ b/src/TConsole.cpp @@ -149,8 +149,7 @@ void TConsole::Command_Help(const std::string&) { kick [reason] kicks specified player with an optional reason list lists all players and info about them say sends the message to all players in chat - lua [state id] switches to lua, optionally into a specific state id's lua -)"; + lua [state id] switches to lua, optionally into a specific state id's lua)"; Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString)); } diff --git a/src/TLuaEngine.cpp b/src/TLuaEngine.cpp index e0cbd89..6881cfc 100644 --- a/src/TLuaEngine.cpp +++ b/src/TLuaEngine.cpp @@ -61,8 +61,11 @@ void TLuaEngine::operator()() { while (!Res->Ready) { std::this_thread::sleep_for(std::chrono::milliseconds(1)); Waited++; - if (Waited > 1000) { - beammp_lua_error(Res->Function + " in " + Res->StateId + " took >1s to respond, not printing possible errors"); + if (Waited > 250) { + // FIXME: This should *eventually* timeout. + // beammp_lua_error(Res->Function + " in " + Res->StateId + " took >1s to respond, not printing possible errors"); + std::unique_lock Lock(mResultsToCheckMutex); + mResultsToCheck.push(Res); break; } }