terminate instead of rethrowing an uncaught exception

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0e93a9c653064ec4aeccbd39d358a80e74fb7be9..0e0b69f28af4aa9686ff4e30fb593f8ea58ea635 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -40,17 +40,28 @@ int Application::run(int argc, char **argv)
 
        try
        {
-               app_=reg_app_->create_app(argc, argv);
+               try
+               {
+                       app_=reg_app_->create_app(argc, argv);
+               }
+               catch(const UsageError &e)
+               {
+                       reg_app_->usage(e.what(), argv[0], e.get_brief());
+                       return 1;
+               }
+
+               int result=app_->main();
+               delete app_;
+               return result;
        }
-       catch(const UsageError &e)
+       catch(const exception &e)
        {
-               reg_app_->usage(e.what(), argv[0], e.get_brief());
-               return 1;
+               cerr<<"An uncaught exception occurred.\n";
+               cerr<<"  type:   "<<typeid(e).name()<<'\n';
+               cerr<<"  what(): "<<e.what()<<'\n';
+               delete app_;
+               terminate();
        }
-
-       int result=app_->main();
-       delete app_;
-       return result;
 }
 
 /**