+#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"
}
catch(const exception &e)
{
- delete app_;
+ bool handled = false;
+ if(const Debug::ErrorReporter *er = Debug::ErrorReporter::get_current())
+ handled = er->report_uncaught_exception(e);
- display_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());
+ }
+
+ delete app_;
return 124;
}