diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-15 00:28:58 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-15 00:28:58 +0300 |
| commit | 7befd63ccedd96c52b94c1845fff36f24ee3f1d1 (patch) | |
| tree | 547b74dc75198e9a3341517fff01b49b4fe0bfe8 | |
| parent | 2c2c39b42c61011698c14869dda71dc1fe3cda64 (diff) | |
| download | PrismLauncher-7befd63ccedd96c52b94c1845fff36f24ee3f1d1.tar.gz PrismLauncher-7befd63ccedd96c52b94c1845fff36f24ee3f1d1.tar.bz2 PrismLauncher-7befd63ccedd96c52b94c1845fff36f24ee3f1d1.zip | |
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
| -rw-r--r-- | launcher/modplatform/import_ftb/PackInstallTask.cpp | 11 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/import_ftb/ListModel.cpp | 1 |
2 files changed, 4 insertions, 8 deletions
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp index e55f6ffa..b5e424d1 100644 --- a/launcher/modplatform/import_ftb/PackInstallTask.cpp +++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp @@ -53,17 +53,14 @@ void PackInstallTask::copySettings() QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg"); auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath); instanceSettings->suspendSave(); - instanceSettings->registerSetting("InstanceType", "OneSix"); - instanceSettings->set("InstanceType", "OneSix"); + MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath); + instance.settings()->set("InstanceType", "OneSix"); if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) { - instanceSettings->registerSetting("OverrideJavaArgs", true); - instanceSettings->set("OverrideJavaArgs", true); - instanceSettings->registerSetting("JvmArgs", m_pack.jvmArgs.toString()); - instanceSettings->set("JvmArgs", m_pack.jvmArgs.toString()); + instance.settings()->set("OverrideJavaArgs", true); + instance.settings()->set("JvmArgs", m_pack.jvmArgs.toString()); } - MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath); auto components = instance.getPackProfile(); components->buildingFromScratch(); components->setComponentVersion("net.minecraft", m_pack.mcVersion, true); diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp index 35d0334b..dc78f451 100644 --- a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp +++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp @@ -17,7 +17,6 @@ */ #include "ListModel.h" -#include <qnamespace.h> #include <QDir> #include <QDirIterator> #include <QFileInfo> |