From 4b0ceea8941826134c949b1c2fb80e05c174e5ec Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sun, 31 Jul 2022 19:56:14 -0300
Subject: [PATCH] fix: correctly set managed pack fields in CF pack

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 9 +++++++++
 launcher/modplatform/flame/FlameInstanceCreationTask.h   | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 4d70e223f..76ac11afa 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -186,6 +186,8 @@ bool FlameCreationTask::updateInstance()
     setOverride(true);
     qDebug() << "Will override instance!";
 
+    m_instance = inst;
+
     // We let it go through the createInstance() stage, just with a couple modifications for updating
     return false;
 }
@@ -319,6 +321,13 @@ bool FlameCreationTask::createInstance()
 
     loop.exec();
 
+    if (m_instance) {
+        auto inst = m_instance.value();
+
+        inst->copyManagedPack(instance);
+        inst->setName(instance.name());
+    }
+
     return getError().isEmpty();
 }
 
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 99822d938..ccb5f8276 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -2,6 +2,10 @@
 
 #include "InstanceCreationTask.h"
 
+#include <optional>
+
+#include "minecraft/MinecraftInstance.h"
+
 #include "modplatform/flame/FileResolvingTask.h"
 
 #include "net/NetJob.h"
@@ -35,4 +39,6 @@ class FlameCreationTask final : public InstanceCreationTask {
     // Handle to allow aborting
     NetJob* m_process_update_file_info_job = nullptr;
     NetJob::Ptr m_files_job = nullptr;
+
+    std::optional<InstancePtr> m_instance;
 };