mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-04 04:16:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

GH-1949 Allow modpacks.ch pack downloads to be aborted

Browse source
This commit is contained in:
Jamie Mansfield 2021-07-06 15:12:07 +01:00
parent d1a142f040
commit db392b4994
No known key found for this signature in database
GPG key ID: 36F61598F39F67B0
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
View file

@ -19,7 +19,11 @@ PackInstallTask::PackInstallTask(Modpack pack, QString version)
bool PackInstallTask::abort()
{
return true;
if(abortable)
{
return jobPtr->abort();
}
return false;
}
void PackInstallTask::executeTask()
@ -117,16 +121,19 @@ void PackInstallTask::downloadPack()
connect(jobPtr.get(), &NetJob::succeeded, this, [&]()
{
abortable = false;
jobPtr.reset();
install();
});
connect(jobPtr.get(), &NetJob::failed, [&](QString reason)
{
abortable = false;
jobPtr.reset();
emitFailed(reason);
});
connect(jobPtr.get(), &NetJob::progress, [&](qint64 current, qint64 total)
{
abortable = true;
setProgress(current, total);
});