From fa64103aa87a8f0f2a3351bb4a54e93e8ade1082 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 27 Dec 2010 14:34:17 +0200
Subject: better debug output in segfaults and stack overflows in windows

---
 src/servermain.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/servermain.cpp')

diff --git a/src/servermain.cpp b/src/servermain.cpp
index 594f7f4a2..01919a7df 100644
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -125,6 +125,8 @@ int main(int argc, char *argv[])
 
 	initializeMaterialProperties();
 
+	BEGIN_DEBUG_EXCEPTION_HANDLER
+
 	try
 	{
 	
@@ -345,17 +347,8 @@ int main(int argc, char *argv[])
 	{
 		dstream<<DTIME<<"Connection timed out."<<std::endl;
 	}
-#if CATCH_UNHANDLED_EXCEPTIONS
-	/*
-		This is what has to be done in every thread to get suitable debug info
-	*/
-	catch(std::exception &e)
-	{
-		dstream<<std::endl<<DTIME<<"An unhandled exception occurred: "
-				<<e.what()<<std::endl;
-		assert(0);
-	}
-#endif
+
+	END_DEBUG_EXCEPTION_HANDLER
 
 	debugstreams_deinit();
 	
-- 
cgit v1.2.3