From 675a35bb2e925c62a141cdaa9177537af8d83f99 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 30 Jul 2019 15:28:17 +0200 Subject: [PATCH] libcalamaresui: when displaying pasted URL, don't be fancy - Just call the static method and then quit, rather than being careful about allocations. --- src/libcalamaresui/ViewManager.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index d9a03fee6..5b932e6d4 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -239,7 +239,9 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail msgBox->show(); cDebug() << "Calamares will quit when the dialog closes."; - connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { + connect( msgBox, &QMessageBox::buttonClicked, [this,msgBox]( QAbstractButton* button ) { + cDebug() << "Button role:" << msgBox->buttonRole( button ); + if ( button->text() != tr( "&Yes" ) ) { QApplication::quit(); @@ -255,14 +257,10 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail pasteUrlMsg = tr( "The upload was unsuccessful. No web-paste was done." ); } - QMessageBox* pasteUrlMsgBox = new QMessageBox(); - pasteUrlMsgBox->setIcon( QMessageBox::Critical ); - pasteUrlMsgBox->setWindowTitle( pasteUrlTitle ); - pasteUrlMsgBox->setStandardButtons( QMessageBox::Close ); - pasteUrlMsgBox->setText( pasteUrlMsg ); - pasteUrlMsgBox->show(); - - connect( pasteUrlMsgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit ); + QMessageBox::critical(nullptr, + pasteUrlTitle, + pasteUrlMsg); + QApplication::quit(); } ); }