X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fapplication.cpp;h=43bb023143679e7fdf5e64d893208f859222d973;hb=f042fd992170ee8a50a7f596f1c9cdd9600b8583;hp=51f013e72c3cb5876429035d2604c95eb1a1f578;hpb=d16185720fa344263367dbd50c61bfc8183d99a4;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 51f013e..43bb023 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,9 +1,7 @@
-#ifdef WIN32
-#include <windows.h>
-#endif
-#include <signal.h>
 #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"
@@ -20,14 +18,6 @@ Application::Application():
 	exit_code(0)
 { }
 
-/**
-Constructs an instance of the registered application class and runs it.  If the
-application throws a usage_error, a help message is printed.  The GetOpt class
-will throw such exceptions automatically in error conditions.
-
-This function can only be called once.  The global main() function provided by
-the library normally does it automatically at program startup.
-*/
 int Application::run(int argc, char **argv, void *data)
 {
 	static bool called = false;
@@ -66,25 +56,23 @@ 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);
 
-#ifdef WIN32
-		string msg = Debug::demangle(typeid(e).name())+":\n"+e.what();
-		MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
-#else
-		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());
-#endif
+		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());
+		}
+
+		delete app_;
 
 		return 124;
 	}
 }
 
-/**
-Default main loop.  Calls tick() repeatedly until exit() is called.  A custom
-main loop should monitor the done member variable and return exit_code.
-*/
 int Application::main()
 {
 	done = false;
@@ -94,26 +82,17 @@ int Application::main()
 	return exit_code;
 }
 
-/**
-Sets the specified signal to be delivered to the sighandler member function.
-*/
 void Application::catch_signal(int s)
 {
 	signal(s, &sighandler_);
 }
 
-/**
-Causes the application to exit gracefully with the given exit code.
-*/
 void Application::exit(int c)
 {
 	done = true;
 	exit_code = c;
 }
 
-/**
-Static wrapper function to call a member function of the Application instance.
-*/
 void Application::sighandler_(int s)
 {
 	app_->sighandler(s);