diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-02-26 14:37:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 14:37:27 +0100 |
| commit | 88fc1e32ee6bb9338c97178aa2530e45899022cb (patch) | |
| tree | c3dd7cbe5e4d3c5e1919ac3a1d4d6d970a7154af | |
| parent | 692b9cf0e0efd00e3f5bc0bbdc4e517010c7773a (diff) | |
| parent | c9bf7f9896af6e864048b9c024d777c47e770f6e (diff) | |
| download | PrismLauncher-88fc1e32ee6bb9338c97178aa2530e45899022cb.tar.gz PrismLauncher-88fc1e32ee6bb9338c97178aa2530e45899022cb.tar.bz2 PrismLauncher-88fc1e32ee6bb9338c97178aa2530e45899022cb.zip | |
Merge pull request #201 from Scrumplex/fix-instancetype-reregistration
| -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; } |