From c59f3102a1a772da33022ca490a32d390ae827a3 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Wed, 17 May 2023 10:30:20 +0200 Subject: [PATCH] CrashHandler: Fix missing update The change to CheckableMessageBox was missed. Change-Id: I8b7fe1230bcf483f9e5371b878d862aff422d925 Reviewed-by: hjk --- .../crashhandlerdialog.cpp | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp index acbc3fa28f7..61d1fd4230d 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp @@ -205,12 +205,10 @@ CrashHandlerDialog::~CrashHandlerDialog() bool CrashHandlerDialog::runDebuggerWhileBacktraceNotFinished() { // Check settings. - QSettings settings(QSettings::IniFormat, QSettings::UserScope, + QSettings settings(QSettings::IniFormat, + QSettings::UserScope, QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR), QLatin1String(SettingsApplication)); - if (settings.value(QLatin1String(SettingsKeySkipWarningAbortingBacktrace), false).toBool()) - return true; - // Ask user. const QString title = tr("Run Debugger And Abort Collecting Backtrace?"); const QString message = tr( @@ -219,15 +217,18 @@ bool CrashHandlerDialog::runDebuggerWhileBacktraceNotFinished() "

You have requested to run the debugger while collecting the backtrace was not " "finished.

" ""); - const QString checkBoxText = tr("Do not &ask again."); - bool checkBoxSetting = false; - const QDialogButtonBox::StandardButton button = Utils::CheckableMessageBox::question(this, - title, message, checkBoxText, &checkBoxSetting, - QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::No); - if (checkBoxSetting) - settings.setValue(QLatin1String(SettingsKeySkipWarningAbortingBacktrace), checkBoxSetting); - return button == QDialogButtonBox::Yes; + const QMessageBox::StandardButton button + = Utils::CheckableMessageBox::question(this, + title, + message, + &settings, + QLatin1String( + SettingsKeySkipWarningAbortingBacktrace), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No); + + return button == QMessageBox::Yes; } void CrashHandlerDialog::setToFinalState()