aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/technic/SolderPackInstallTask.cpp
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-07-28 15:58:04 -0300
committerflow <flowlnlnln@gmail.com>2022-09-20 18:36:09 -0300
commit654157096985d0cec0d3b7bb53f39a5c0157206e (patch)
tree91a522b27991652829711e2f7cfb28887b53ed1f /launcher/modplatform/technic/SolderPackInstallTask.cpp
parent4b0ceea8941826134c949b1c2fb80e05c174e5ec (diff)
downloadPrismLauncher-654157096985d0cec0d3b7bb53f39a5c0157206e.tar.gz
PrismLauncher-654157096985d0cec0d3b7bb53f39a5c0157206e.tar.bz2
PrismLauncher-654157096985d0cec0d3b7bb53f39a5c0157206e.zip
fix: simplify abort handling and add missing emits
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/modplatform/technic/SolderPackInstallTask.cpp')
-rw-r--r--launcher/modplatform/technic/SolderPackInstallTask.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/launcher/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp
index 65b6ca51..19731b38 100644
--- a/launcher/modplatform/technic/SolderPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp
@@ -77,6 +77,7 @@ void Technic::SolderPackInstallTask::executeTask()
auto job = m_filesNetJob.get();
connect(job, &NetJob::succeeded, this, &Technic::SolderPackInstallTask::fileListSucceeded);
connect(job, &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
+ connect(job, &NetJob::aborted, this, &Technic::SolderPackInstallTask::downloadAborted);
m_filesNetJob->start();
}
@@ -127,6 +128,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
connect(m_filesNetJob.get(), &NetJob::succeeded, this, &Technic::SolderPackInstallTask::downloadSucceeded);
connect(m_filesNetJob.get(), &NetJob::progress, this, &Technic::SolderPackInstallTask::downloadProgressChanged);
connect(m_filesNetJob.get(), &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
+ connect(m_filesNetJob.get(), &NetJob::aborted, this, &Technic::SolderPackInstallTask::downloadAborted);
m_filesNetJob->start();
}
@@ -171,6 +173,12 @@ void Technic::SolderPackInstallTask::downloadProgressChanged(qint64 current, qin
setProgress(current / 2, total);
}
+void Technic::SolderPackInstallTask::downloadAborted()
+{
+ emitAborted();
+ m_filesNetJob.reset();
+}
+
void Technic::SolderPackInstallTask::extractFinished()
{
if (!m_extractFuture.result())