CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correctly set managed pack fields in CF pack

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-07-31 19:56:14 -03:00
parent 8c0816c166
commit 4b0ceea894
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -186,6 +186,8 @@ bool FlameCreationTask::updateInstance()
setOverride(true); setOverride(true);
qDebug() << "Will override instance!"; qDebug() << "Will override instance!";
m_instance = inst;
// We let it go through the createInstance() stage, just with a couple modifications for updating // We let it go through the createInstance() stage, just with a couple modifications for updating
return false; return false;
} }
@ -319,6 +321,13 @@ bool FlameCreationTask::createInstance()
loop.exec(); loop.exec();
if (m_instance) {
auto inst = m_instance.value();
inst->copyManagedPack(instance);
inst->setName(instance.name());
}
return getError().isEmpty(); return getError().isEmpty();
} }

6
launcher/modplatform/flame/FlameInstanceCreationTask.h
View File

@ -2,6 +2,10 @@
#include "InstanceCreationTask.h" #include "InstanceCreationTask.h"
#include <optional>
#include "minecraft/MinecraftInstance.h"
#include "modplatform/flame/FileResolvingTask.h" #include "modplatform/flame/FileResolvingTask.h"
#include "net/NetJob.h" #include "net/NetJob.h"
@ -35,4 +39,6 @@ class FlameCreationTask final : public InstanceCreationTask {
// Handle to allow aborting // Handle to allow aborting
NetJob* m_process_update_file_info_job = nullptr; NetJob* m_process_update_file_info_job = nullptr;
NetJob::Ptr m_files_job = nullptr; NetJob::Ptr m_files_job = nullptr;
std::optional<InstancePtr> m_instance;
}; };