More specific error message for "unknown" exceptions.

[toast/confclerk.git] / src / app / application.cpp

diff --git a/src/app/application.cpp b/src/app/application.cpp
index cd8c01a6306afdede047d690b3730f1bc2abed53..e8ad62bb44209875e5f78639c3b9ab67a252628c 100644 (file)
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -16,10 +17,15 @@
  * You should have received a copy of the GNU General Public License along with
  * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
+#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
+#include <cxxabi.h>
+#endif
+#include <exception>
+
 #include "application.h"
 #include "errormessage.h"
 
-#include <ormrecord.h>
+#include "ormrecord.h"
 
 // if the application uses exceptions,
 // there is always a possibility that some will leak uncached from event handler
@@ -31,8 +37,17 @@ bool Application::notify(QObject* receiver, QEvent* event)
     } catch (OrmException& e) {
         error_message("UNCAUGHT OrmException: " + e.text());
         return false;
+    } catch (std::exception& e) {
+        error_message("UNCAUGHT exception: " + QString(e.what()));
+        return false;
     } catch (...) {
-        error_message("UNCAUGHT EXCEPTION: unknown");
+        error_message("UNCAUGHT exception: " +
+#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
+                QString(__cxxabiv1::__cxa_current_exception_type()->name())
+#else
+                "unknown"
+#endif
+                );
         return false;
     }
 }