diff options
| author | Ryan Cao <70191398+ryanccn@users.noreply.github.com> | 2022-11-21 23:19:50 +0800 |
|---|---|---|
| committer | Ryan Cao <70191398+ryanccn@users.noreply.github.com> | 2022-11-21 23:19:50 +0800 |
| commit | f916ce875266ea2070c10f80ded35b66d315418c (patch) | |
| tree | 5aa0caaac52847222a23482ff5fba7b41fca0f26 /launcher/ui/dialogs | |
| parent | 7096f02b88e982df6c770113146a07874a1e9d0f (diff) | |
| parent | 5cc91965d09070437af8c17113c5740401b127dd (diff) | |
| download | PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.tar.gz PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.tar.bz2 PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu
Diffstat (limited to 'launcher/ui/dialogs')
| -rw-r--r-- | launcher/ui/dialogs/ProgressDialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp index 05269f62..da73a449 100644 --- 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() |