From 87002fb8f84b104a221de07ba99ba0eb5cc6bbb6 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sun, 31 Jul 2022 18:21:59 -0300
Subject: fix: hook up setAbortStatus in instance import tasks

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp       | 5 ++++-
 launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp | 5 ++++-
 launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h   | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 76ac11af..c8b2e297 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -27,6 +27,9 @@ static const FlameAPI api;
 
 bool FlameCreationTask::abort()
 {
+    if (!canAbort())
+        return false;
+
     if (m_process_update_file_info_job)
         m_process_update_file_info_job->abort();
     if (m_files_job)
@@ -34,7 +37,7 @@ bool FlameCreationTask::abort()
     if (m_mod_id_resolver)
         m_mod_id_resolver->abort();
 
-    return true;
+    return Task::abort();
 }
 
 bool FlameCreationTask::updateInstance()
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;
-- 
cgit