0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix abort?

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-03-04 11:07:07 +00:00
parent f583e617ec
commit 87384182a1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
View File

@ -54,8 +54,12 @@ void ModrinthPackExportTask::executeTask()
} }
bool ModrinthPackExportTask::abort() { bool ModrinthPackExportTask::abort() {
if (!task.isNull()) if (!task.isNull() && task->abort()) {
return task->abort(); task = nullptr;
emitFailed(tr("Aborted"));
return true;
}
return false; return false;
} }

3
launcher/ui/dialogs/ExportMrPackDialog.cpp
View File

@ -70,7 +70,8 @@ void ExportMrPackDialog::done(int result)
ProgressDialog progress(this); ProgressDialog progress(this);
progress.setSkipButton(true, tr("Abort")); progress.setSkipButton(true, tr("Abort"));
progress.execWithTask(&task); if (progress.execWithTask(&task) != QDialog::Accepted)
return;
} }
QDialog::done(result); QDialog::done(result);