From 49cec3f78240ed6310a9b5dd05ce09a79ed5a12e Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Wed, 18 Dec 2013 16:35:55 -0500
Subject: Handle LuaErrors in Lua -> C++ calls on LuaJIT

---
 src/game.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/game.cpp')

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.");
 	}
 
-- 
cgit v1.2.3