diff options
| author | flow <flowlnlnln@gmail.com> | 2022-09-26 08:25:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 08:25:12 -0300 |
| commit | 370c3aa5985698351e706e61c660a3a566a5f09b (patch) | |
| tree | 5bd62ceec118396d676cf3799edafdb806e4375d /launcher/ui/dialogs/ProgressDialog.cpp | |
| parent | 58a5331f7bafb149c18f560a0363daab65521262 (diff) | |
| parent | dd6f670dec7dfd1a9ad6f4595ad5447ac735c737 (diff) | |
| download | PrismLauncher-370c3aa5985698351e706e61c660a3a566a5f09b.tar.gz PrismLauncher-370c3aa5985698351e706e61c660a3a566a5f09b.tar.bz2 PrismLauncher-370c3aa5985698351e706e61c660a3a566a5f09b.zip | |
Merge pull request #894 from flowln/update_from_external_source
epic PR
Diffstat (limited to 'launcher/ui/dialogs/ProgressDialog.cpp')
| -rw-r--r-- | launcher/ui/dialogs/ProgressDialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp index 3c7f53d3..258a32e4 100644 --- a/launcher/ui/dialogs/ProgressDialog.cpp +++ b/launcher/ui/dialogs/ProgressDialog.cpp @@ -43,8 +43,7 @@ void ProgressDialog::setSkipButton(bool present, QString label) void ProgressDialog::on_skipButton_clicked(bool checked) { Q_UNUSED(checked); - if (task->abort()) - QDialog::reject(); + task->abort(); } ProgressDialog::~ProgressDialog() @@ -81,7 +80,8 @@ int ProgressDialog::execWithTask(Task* task) connect(task, &Task::stepStatus, this, &ProgressDialog::changeStatus); connect(task, &Task::progress, this, &ProgressDialog::changeProgress); - connect(task, &Task::aborted, [this] { onTaskFailed(tr("Aborted by user")); }); + connect(task, &Task::aborted, [this] { QDialog::reject(); }); + connect(task, &Task::abortStatusChanged, ui->skipButton, &QPushButton::setEnabled); m_is_multi_step = task->isMultiStep(); if (!m_is_multi_step) { |