diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-02-25 23:23:08 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-02-26 00:31:37 +0100 |
| commit | c9bf7f9896af6e864048b9c024d777c47e770f6e (patch) | |
| tree | e6ea40a568bed937e67c5283e10b2db76350f4f1 /launcher | |
| parent | 27f37315f84536d75d95bc1879e8a4513fcfc831 (diff) | |
| download | PrismLauncher-c9bf7f9896af6e864048b9c024d777c47e770f6e.tar.gz PrismLauncher-c9bf7f9896af6e864048b9c024d777c47e770f6e.tar.bz2 PrismLauncher-c9bf7f9896af6e864048b9c024d777c47e770f6e.zip | |
fix: load instances no matter their instance type
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/InstanceList.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index 04b86f6b..6e37e3d8 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -543,19 +543,8 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id) auto instanceRoot = FS::PathCombine(m_instDir, id); auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(instanceRoot, "instance.cfg")); InstancePtr inst; - - instanceSettings->registerSetting("InstanceType", "Legacy"); // intentionally Legacy. We don't support it. - - QString inst_type = instanceSettings->get("InstanceType").toString(); - - if (inst_type == "OneSix" || inst_type == "Nostalgia") - { - inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot)); - } - else - { - inst.reset(new NullInstance(m_globalSettings, instanceSettings, instanceRoot)); - } + // TODO: Handle incompatible instances + inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot)); qDebug() << "Loaded instance " << inst->name() << " from " << inst->instanceRoot(); return inst; } |