Ignore:
Timestamp:
08/30/17 20:38:27 (5 years ago)
Author:
gregor herrmann <gregor@…>
Branches:
master, qt5
Children:
79a7671
Parents:
ebe26af (diff), e27a3f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into qt5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/app/application.cpp

    rebe26af r809b5e5  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
     
    1818 * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
    1919 */
     20#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
     21#include <cxxabi.h>
     22#endif
     23#include <exception>
     24
    2025#include "application.h"
    2126#include "errormessage.h"
     
    3338        error_message("UNCAUGHT OrmException: " + e.text());
    3439        return false;
     40    } catch (std::exception& e) {
     41        error_message("UNCAUGHT exception: " + QString(e.what()));
     42        return false;
    3543    } catch (...) {
    36         error_message("UNCAUGHT EXCEPTION: unknown");
     44#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
     45        int status = 0;
     46        char *buff = __cxxabiv1::__cxa_demangle(
     47                __cxxabiv1::__cxa_current_exception_type()->name(),
     48                NULL, NULL, &status);
     49        QString exception_name = QString(buff);
     50        std::free(buff);
     51#else
     52        QString exception_name = QString("unknown");
     53#endif
     54        error_message("UNCAUGHT exception: " + exception_name);
    3755        return false;
    3856    }
Note: See TracChangeset for help on using the changeset viewer.