aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/MinecraftUpdate.cpp
diff options
context:
space:
mode:
authorEzekiel Smith <ezekielsmith@protonmail.com>2022-07-03 01:50:36 +1000
committerGitHub <noreply@github.com>2022-07-03 01:50:36 +1000
commit7f22994f6889706ba667baca32968787fe86ad44 (patch)
tree7271bac27d2954c73c277a29baf94961d282b49a /launcher/minecraft/MinecraftUpdate.cpp
parent7aba7b60641c74ead1f57c3ebe6a56c93dd4d5d1 (diff)
parent5da87d190464421b4dc50810aaf9619f1ef29d5a (diff)
downloadPrismLauncher-7f22994f6889706ba667baca32968787fe86ad44.tar.gz
PrismLauncher-7f22994f6889706ba667baca32968787fe86ad44.tar.bz2
PrismLauncher-7f22994f6889706ba667baca32968787fe86ad44.zip
Merge pull request #831 from flowln/abort_connections
Add missing connections to the abort signal in some tasks
Diffstat (limited to 'launcher/minecraft/MinecraftUpdate.cpp')
-rw-r--r--launcher/minecraft/MinecraftUpdate.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/launcher/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp
index 32e9cbb6..0ce0c347 100644
--- a/launcher/minecraft/MinecraftUpdate.cpp
+++ b/launcher/minecraft/MinecraftUpdate.cpp
@@ -98,6 +98,7 @@ void MinecraftUpdate::next()
auto task = m_tasks[m_currentTask - 1];
disconnect(task.get(), &Task::succeeded, this, &MinecraftUpdate::subtaskSucceeded);
disconnect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
+ disconnect(task.get(), &Task::aborted, this, &Task::abort);
disconnect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
disconnect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
}
@@ -115,6 +116,7 @@ void MinecraftUpdate::next()
}
connect(task.get(), &Task::succeeded, this, &MinecraftUpdate::subtaskSucceeded);
connect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
+ connect(task.get(), &Task::aborted, this, &Task::abort);
connect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
connect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
// if the task is already running, do not start it again