teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Use custom Lua error handler not only on Windows

Browse source 
For some reason sol's default error handler does not wroking properly
This commit is contained in:
Koncord 2017-11-01 21:48:42 +08:00
parent 71c921faa7
commit bd7082f57e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw-mp/Script/LuaState.cpp
View file

@ -32,7 +32,7 @@
using namespace std; using namespace std;
#if defined(SOL_SAFE_FUNCTIONS) && defined(WIN32) #if defined(SOL_SAFE_FUNCTIONS)
inline int errHandler(lua_State *L) inline int errHandler(lua_State *L)
{ {
string msg = "An unknown error has triggered the default error handler"; string msg = "An unknown error has triggered the default error handler";
@ -107,7 +107,7 @@ LuaState::LuaState()
// Enable a special Sol error handler for Windows, because exceptions aren't caught properly // Enable a special Sol error handler for Windows, because exceptions aren't caught properly
// in main.cpp for it // in main.cpp for it
#if defined(SOL_SAFE_FUNCTIONS) && defined(WIN32) #if defined(SOL_SAFE_FUNCTIONS)
lua_CFunction f = sol::c_call<decltype(&errHandler), &errHandler>; lua_CFunction f = sol::c_call<decltype(&errHandler), &errHandler>;
sol::protected_function::set_default_handler(sol::object(lua->lua_state(), sol::in_place, f)); sol::protected_function::set_default_handler(sol::object(lua->lua_state(), sol::in_place, f));
#endif #endif