From 970e4b020ea14a1fbd5abe65517a3e26399280cb Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 22 Oct 2022 14:11:51 +0200
Subject: [PATCH] fix: fix segfault when resolving Flame resources

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/modplatform/flame/FileResolvingTask.cpp | 14 ++++++--------
 launcher/modplatform/flame/FileResolvingTask.h   |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 0b2431f7..c50abb8f 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -12,6 +12,8 @@ bool Flame::FileResolvingTask::abort()
     bool aborted = true;
     if (m_dljob)
         aborted &= m_dljob->abort();
+    if (m_checkJob)
+        aborted &= m_checkJob->abort();
     return aborted ? Task::abort() : false;
 }
 
@@ -40,7 +42,7 @@ void Flame::FileResolvingTask::netJobFinished()
     setProgress(1, 3);
     int index = 0;
     // job to check modrinth for blocked projects
-    auto job = new NetJob("Modrinth check", m_network);
+    m_checkJob = new NetJob("Modrinth check", m_network);
     blockedProjects = QMap<File *,QByteArray *>();
     auto doc = Json::requireDocument(*result);
     auto array = Json::requireArray(doc.object()["data"]);
@@ -60,19 +62,15 @@ void Flame::FileResolvingTask::netJobFinished()
                     out.resolved = true;
                 });
 
-                job->addNetAction(dl);
+                m_checkJob->addNetAction(dl);
                 blockedProjects.insert(&out, output);
             }
         }
         index++;
     }
-    connect(job, &NetJob::finished, this,
-        [this, &job] {
-            modrinthCheckFinished();
-            job->deleteLater();
-        });
+    connect(m_checkJob.get(), &NetJob::finished, this, &Flame::FileResolvingTask::modrinthCheckFinished);
 
-    job->start();
+    m_checkJob->start();
 }
 
 void Flame::FileResolvingTask::modrinthCheckFinished() {
diff --git a/launcher/modplatform/flame/FileResolvingTask.h b/launcher/modplatform/flame/FileResolvingTask.h
index f71b87ce..8fc17ea9 100644
--- a/launcher/modplatform/flame/FileResolvingTask.h
+++ b/launcher/modplatform/flame/FileResolvingTask.h
@@ -30,8 +30,9 @@ protected slots:
 private: /* data */
     shared_qobject_ptr<QNetworkAccessManager> m_network;
     Flame::Manifest m_toProcess;
-    std::shared_ptr<QByteArray> result;
+	std::shared_ptr<QByteArray> result;
     NetJob::Ptr m_dljob;
+	NetJob::Ptr m_checkJob;
 
     void modrinthCheckFinished();