From 1e347230d1cc6c7c3d1925cc8c55db57c05b0d73 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 24 May 2021 19:50:47 +0100 Subject: [PATCH] Ensure verify message is actually logged before aborting --- src/blackmisc/verify.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/verify.cpp b/src/blackmisc/verify.cpp index 708f7be4a..cca56bb94 100644 --- a/src/blackmisc/verify.cpp +++ b/src/blackmisc/verify.cpp @@ -64,15 +64,16 @@ namespace BlackMisc #endif #if defined(QT_NO_DEBUG) || defined(Q_CC_MSVC) - auto logger = QMessageLogger().warning(QLoggingCategory(qPrintable(CLogCategories::verification()))); + QString log; if (context && message) { - logger << QStringLiteral("Failed to verify: %1 (%2 in %3) in %4 line %5").arg(condition, message, context, filename, QString::number(line)); + log = QStringLiteral("Failed to verify: %1 (%2 in %3) in %4 line %5").arg(condition, message, context, filename, QString::number(line)); } else { - logger << QStringLiteral("Failed to verify: %1 in %2 line %3").arg(condition, filename, QString::number(line)); + log = QStringLiteral("Failed to verify: %1 in %2 line %3").arg(condition, filename, QString::number(line)); } + QMessageLogger().warning(QLoggingCategory(qPrintable(CLogCategories::verification()))) << log; # if defined(BLACK_USE_CRASHPAD) CRASHPAD_SIMULATE_CRASH(); # endif