Merge pull request #243 from Scrumplex/migration-dialog

Closes https://github.com/PrismLauncher/PrismLauncher/issues/46 Closes https://github.com/PrismLauncher/PrismLauncher/issues/204
2022-11-21 12:14:49 +01:00
parent 30607c34a1 fe94c3609e
commit c74f852364
11 changed files with 341 additions and 33 deletions
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@ -44,7 +44,8 @@ void ProgressDialog::setSkipButton(bool present, QString label)
 void ProgressDialog::on_skipButton_clicked(bool checked)
 {
    Q_UNUSED(checked);
-    task->abort();
+    if (ui->skipButton->isEnabled())  // prevent other triggers from aborting
+        task->abort();
 }

 ProgressDialog::~ProgressDialog()