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

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
Show Stats 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);
});

3
api/logic/modplatform/modpacksch/FTBPackInstallTask.h
View File

@ -16,6 +16,7 @@ public:
explicit PackInstallTask(Modpack pack, QString version);
virtual ~PackInstallTask(){}
bool canAbort() const override { return true; }
bool abort() override;
protected:
@ -30,6 +31,8 @@ private:
void install();
private:
bool abortable = false;
NetJobPtr jobPtr;
QByteArray response;