Qt: Avoid double cancellation in updater

4 months ago · de8f42733d
parent 6e58776342
commit de8f42733d
1 changed files with 5 additions and 1 deletions
--- a/src/duckstation-qt/interfacesettingswidget.cpp
+++ b/src/duckstation-qt/interfacesettingswidget.cpp
@ -311,7 +311,11 @@ void InterfaceSettingsWidget::checkForUpdates()
  pdlg->setMinimumWidth(400);
  pdlg->open();

-  connect(pdlg, &QProgressDialog::canceled, dlg, &AutoUpdaterDialog::cancel);
+  connect(pdlg, &QProgressDialog::canceled, dlg, [pdlg, dlg]() {
+    // Qt sends cancelled() on close...
+    if (pdlg->wasCanceled())
+      dlg->cancel();
+  });
  connect(dlg, &AutoUpdaterDialog::updateCheckAboutToComplete, pdlg, &QProgressDialog::close);

  dlg->queueUpdateCheck(true, true);