diff options
| author | flow <flowlnlnln@gmail.com> | 2022-07-31 18:21:59 -0300 |
|---|---|---|
| committer | flow <flowlnlnln@gmail.com> | 2022-09-20 18:36:09 -0300 |
| commit | 87002fb8f84b104a221de07ba99ba0eb5cc6bbb6 (patch) | |
| tree | 096f918032a507cd145545a63e34268ac3a03270 /launcher/modplatform/modrinth | |
| parent | 6a50fa35ec0dcb8b91ffc0ce70d4d8b9ee5d9fb8 (diff) | |
| download | PrismLauncher-87002fb8f84b104a221de07ba99ba0eb5cc6bbb6.tar.gz PrismLauncher-87002fb8f84b104a221de07ba99ba0eb5cc6bbb6.tar.bz2 PrismLauncher-87002fb8f84b104a221de07ba99ba0eb5cc6bbb6.zip | |
fix: hook up setAbortStatus in instance import tasks
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/modplatform/modrinth')
| -rw-r--r-- | launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp | 5 | ||||
| -rw-r--r-- | launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp index b5140f34..3234d92b 100644 --- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp +++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp @@ -19,9 +19,12 @@ bool ModrinthCreationTask::abort() { + if (!canAbort()) + return false; + if (m_files_job) return m_files_job->abort(); - return true; + return Task::abort(); } bool ModrinthCreationTask::updateInstance() diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h index bcf80682..e87e4fb9 100644 --- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h +++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h @@ -22,7 +22,6 @@ class ModrinthCreationTask final : public InstanceCreationTask { } bool abort() override; - bool canAbort() const override { return true; } bool updateInstance() override; bool createInstance() override; |