X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=daeb1300d16602fcd1ff3c9f3ca82952a2b2a50a;hb=7db1e6d50594b47a32ecca5a349a4e8540f890c0;hp=5acae82242b0a6d4106c7d647460934fd6acae12;hpb=516755dde30a4820495580d1b52a5b992f800461;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 5acae82..daeb130 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,8 +4,10 @@ This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <signal.h>
 #include <iostream>
+#include <typeinfo>
 #include "../debug/backtrace.h"
 #include "../debug/demangle.h"
 #include "../time/units.h"
@@ -60,6 +62,12 @@ int Application::run(int argc, char **argv, void *data)
 	}
 	catch(const exception &e)
 	{
+		delete app_;
+
+#ifdef WIN32
+		string msg=Debug::demangle(typeid(e).name())+":\n"+e.what();
+		MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
+#else
 		cerr<<"An uncaught exception occurred.\n";
 		cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
 		cerr<<"  what(): "<<e.what()<<'\n';
@@ -70,15 +78,10 @@ int Application::run(int argc, char **argv, void *data)
 			cerr<<"  backtrace:\n";
 			const Debug::Backtrace::FrameSeq &frames=exc->get_backtrace().get_frames();
 			for(Debug::Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-			{
-				cerr<<"    "<<i->address;
-				if(!i->symbol.empty())
-					cerr<<" in "<<i->symbol;
-				cerr<<" from "<<i->file<<'\n';
-			}
+				cerr<<"    "<<*i<<'\n';
 		}
+#endif
 
-		delete app_;
 		return 124;
 	}
 }