summaryrefslogtreecommitdiff
path: root/src/servermain.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2010-12-27 14:34:17 +0200
committerPerttu Ahola <celeron55@gmail.com>2010-12-27 14:34:17 +0200
commitfa64103aa87a8f0f2a3351bb4a54e93e8ade1082 (patch)
tree689986c383e3444cba35a16864e03f61593c5686 /src/servermain.cpp
parent847a4227b850bc943d11c5b8191fb6bcbce1920a (diff)
downloadminetest-fa64103aa87a8f0f2a3351bb4a54e93e8ade1082.tar.gz
minetest-fa64103aa87a8f0f2a3351bb4a54e93e8ade1082.tar.bz2
minetest-fa64103aa87a8f0f2a3351bb4a54e93e8ade1082.zip
better debug output in segfaults and stack overflows in windows
Diffstat (limited to 'src/servermain.cpp')
-rw-r--r--src/servermain.cpp15
1 files changed, 4 insertions, 11 deletions
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();