Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu

2022-11-21 23:19:50 +08:00
parent 7096f02b88 5cc91965d0
commit f916ce8752
124 changed files with 2667 additions and 776 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()