Demangling exception class name from error message of unknown exceptions.

diff --git a/src/app/application.cpp b/src/app/application.cpp
index e8ad62bb44209875e5f78639c3b9ab67a252628c..386b681a0389d1b4d6a7e554af4eee4f903fa114 100644 (file)
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -41,13 +41,17 @@ bool Application::notify(QObject* receiver, QEvent* event)
         error_message("UNCAUGHT exception: " + QString(e.what()));
         return false;
     } catch (...) {
-        error_message("UNCAUGHT exception: " +
 #if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
-                QString(__cxxabiv1::__cxa_current_exception_type()->name())
+        int status = 0;
+        char *buff = __cxxabiv1::__cxa_demangle(
+                __cxxabiv1::__cxa_current_exception_type()->name(),
+                NULL, NULL, &status);
+        QString exception_name = QString(buff);
+        std::free(buff);
 #else
-                "unknown"
+        QString exception_name = QString("unknown");
 #endif
-                );
+        error_message("UNCAUGHT exception: " + exception_name);
         return false;
     }
 }