X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=3a5561eb5f6d6db8b62b488ab3c7c81132384812;hb=53ce154a2e446e82815034cb65a81b6784a767f5;hp=ebd928b7b7ce049cd2d33ebcedba2ab8f8d4f190;hpb=b2333b53a0434eb6a131000c0b9bf06e4f603bd6;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index ebd928b..3a5561e 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,4 +1,7 @@
+#include <typeinfo>
 #include <signal.h>
+#include <msp/debug/demangle.h>
+#include <msp/debug/errorreporter.h>
 #include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
@@ -13,21 +16,16 @@ void *Application::data_ = 0;
 
 Application::Application():
 	exit_code(0)
-{ }
-
-int Application::run(int argc, char **argv, void *data)
 {
-	static bool called = false;
-	if(called)
-	{
-		IO::cerr.write("Trying to call Application::run_app twice!\n");
-		return 125;
-	}
-	called = true;
+	if(app_)
+		throw logic_error("instance already exists");
+}
 
+int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
+{
 	if(!starter_)
 	{
-		IO::cerr.write("Trying to run with no RegisteredApplication class!\n");
+		IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
 		return 126;
 	}
 
@@ -45,6 +43,9 @@ int Application::run(int argc, char **argv, void *data)
 			return 1;
 		}
 
+		if(created_callback)
+			created_callback(data);
+
 		int result = app_->main();
 		Application *a = app_;
 		app_ = 0;
@@ -53,9 +54,19 @@ int Application::run(int argc, char **argv, void *data)
 	}
 	catch(const exception &e)
 	{
-		delete app_;
+		bool handled = false;
+		if(const Debug::ErrorReporter *er = Debug::ErrorReporter::get_current())
+			handled = er->report_uncaught_exception(e);
+
+		if(!handled)
+		{
+			IO::print(IO::cerr, "An uncaught exception occurred.\n");
+			IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
+			IO::print(IO::cerr, "  what(): %s\n", e.what());
+		}
 
-		display_exception(e);
+		delete app_;
+		app_ = 0;
 
 		return 124;
 	}