X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=e1a93141480c9cf3459c483d5b66c5440529703b;hp=47c176bd8a882a6869df467e7330f2274bfcc5e4;hb=c13c5d2e330e4cee177c1fd8e0b6153c7e2503e4;hpb=f6147f00575bdf6e6b53c2ab81161f5f73d0ab84

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 47c176b..e1a9314 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -6,10 +6,12 @@ Distributed under the LGPL
 */
 #include <signal.h>
 #include <iostream>
+#include "../debug/backtrace.h"
+#include "../debug/demangle.h"
 #include "../time/units.h"
 #include "../time/utils.h"
 #include "application.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 
@@ -57,10 +59,25 @@ int Application::run(int argc, char **argv)
 	catch(const exception &e)
 	{
 		cerr<<"An uncaught exception occurred.\n";
-		cerr<<"  type:   "<<typeid(e).name()<<'\n';
+		cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
 		cerr<<"  what(): "<<e.what()<<'\n';
+
+		const Exception *exc=dynamic_cast<const Exception *>(&e);
+		if(exc && !exc->get_backtrace().get_frames().empty())
+		{
+			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';
+			}
+		}
+
 		delete app_;
-		throw;
+		return 124;
 	}
 }