diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2013-12-18 16:35:55 -0500 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2013-12-18 16:35:55 -0500 |
| commit | 49cec3f78240ed6310a9b5dd05ce09a79ed5a12e (patch) | |
| tree | 38e8199e49906357939e74b6ed0b00f6f54de976 /src/game.cpp | |
| parent | 38d112033b3ba0ea0360fced334a279576aafc5d (diff) | |
| download | minetest-49cec3f78240ed6310a9b5dd05ce09a79ed5a12e.tar.gz minetest-49cec3f78240ed6310a9b5dd05ce09a79ed5a12e.tar.bz2 minetest-49cec3f78240ed6310a9b5dd05ce09a79ed5a12e.zip | |
Handle LuaErrors in Lua -> C++ calls on LuaJIT
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp index cc5d3d81d..6f48870ad 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3438,14 +3438,12 @@ void the_game( L" running a different version of Minetest."; errorstream<<wide_to_narrow(error_message)<<std::endl; } - catch(ServerError &e) - { + catch(ServerError &e) { error_message = narrow_to_wide(e.what()); - errorstream<<wide_to_narrow(error_message)<<std::endl; + errorstream << "ServerError: " << e.what() << std::endl; } - catch(ModError &e) - { - errorstream<<e.what()<<std::endl; + catch(ModError &e) { + errorstream << "ModError: " << e.what() << std::endl; error_message = narrow_to_wide(e.what()) + wgettext("\nCheck debug.txt for details."); } |