Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-24 23:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix LuaJIT exception wrapper

Browse Source
This commit is contained in:
Kahrl 2014-08-23 14:30:51 +02:00
parent f33d31693e
commit 3e267a6ece
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/common/c_internal.cpp
View File

@ -64,8 +64,10 @@ int script_exception_wrapper(lua_State *L, lua_CFunction f)
return f(L); // Call wrapped function and return result. return f(L); // Call wrapped function and return result.
} catch (const char *s) { // Catch and convert exceptions. } catch (const char *s) { // Catch and convert exceptions.
lua_pushstring(L, s); lua_pushstring(L, s);
} catch (LuaError& e) { } catch (std::exception& e) {
lua_pushstring(L, e.what()); lua_pushstring(L, e.what());
} catch (...) {
lua_pushliteral(L, "caught (...)");
} }
return lua_error(L); // Rethrow as a Lua error. return lua_error(L); // Rethrow as a Lua error.
} }