Prevent the new update box from blocking input on other dialogues

PR #16678.
This commit is contained in:
summer 2022-05-01 21:20:00 +08:00 committed by GitHub
commit 0c8220c9fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1920,6 +1920,7 @@ void MainWindow::handleUpdateCheckFinished(ProgramUpdater *updater, const bool i
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setAttribute(Qt::WA_ShowWithoutActivating); msgBox->setAttribute(Qt::WA_ShowWithoutActivating);
msgBox->setDefaultButton(QMessageBox::Yes); msgBox->setDefaultButton(QMessageBox::Yes);
msgBox->setWindowModality(Qt::NonModal);
connect(msgBox, &QMessageBox::buttonClicked, this, [msgBox, updater](QAbstractButton *button) connect(msgBox, &QMessageBox::buttonClicked, this, [msgBox, updater](QAbstractButton *button)
{ {
if (msgBox->buttonRole(button) == QMessageBox::YesRole) if (msgBox->buttonRole(button) == QMessageBox::YesRole)
@ -1928,7 +1929,7 @@ void MainWindow::handleUpdateCheckFinished(ProgramUpdater *updater, const bool i
} }
}); });
connect(msgBox, &QDialog::finished, this, cleanup); connect(msgBox, &QDialog::finished, this, cleanup);
msgBox->open(); msgBox->show();
} }
else else
{ {
@ -1938,8 +1939,9 @@ void MainWindow::handleUpdateCheckFinished(ProgramUpdater *updater, const bool i
, tr("No updates available.\nYou are already using the latest version.") , tr("No updates available.\nYou are already using the latest version.")
, QMessageBox::Ok, this}; , QMessageBox::Ok, this};
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setWindowModality(Qt::NonModal);
connect(msgBox, &QDialog::finished, this, cleanup); connect(msgBox, &QDialog::finished, this, cleanup);
msgBox->open(); msgBox->show();
} }
else else
{ {