CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: hook up setAbortStatus in instance import tasks

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow
2022-07-31 18:21:59 -03:00
parent 6a50fa35ec
commit 87002fb8f8
7 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/InstanceImportTask.cpp
View File

@ -63,15 +63,20 @@ InstanceImportTask::InstanceImportTask(const QUrl sourceUrl, QWidget* parent)
bool InstanceImportTask::abort()
{
if (!canAbort())
return false;
if (m_filesNetJob)
m_filesNetJob->abort();
m_extractFuture.cancel();
return false;
return Task::abort();
}
void InstanceImportTask::executeTask()
{
setAbortStatus(true);
if (m_sourceUrl.isLocalFile()) {
m_archivePath = m_sourceUrl.toLocalFile();
processZipPack();
@ -274,6 +279,7 @@ void InstanceImportTask::processFlame()
connect(inst_creation_task, &Task::finished, inst_creation_task, &InstanceCreationTask::deleteLater);
connect(this, &Task::aborted, inst_creation_task, &InstanceCreationTask::abort);
connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortStatus);
inst_creation_task->start();
}
@ -336,6 +342,7 @@ void InstanceImportTask::processModrinth()
connect(inst_creation_task, &Task::finished, inst_creation_task, &InstanceCreationTask::deleteLater);
connect(this, &Task::aborted, inst_creation_task, &InstanceCreationTask::abort);
connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortStatus);
inst_creation_task->start();
}