diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-04-07 00:27:24 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-07 00:27:24 +0200 |
| commit | 795889d934e8f4ebe89be1a49a3417fd98e89be1 (patch) | |
| tree | c5b0d30d425003c4b88e84a2908e63eb5ed797b9 /api/logic/InstanceCreationTask.cpp | |
| parent | 160b5033a79e6b5ee9f3e2a001b96c677f41ddcb (diff) | |
| parent | 8e58d61150b0bdbe9eb91065d36342f3004fe97b (diff) | |
| download | MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar.gz MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar.lz MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar.xz MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.zip | |
Merge branch 'feature/meta' into develop
Diffstat (limited to 'api/logic/InstanceCreationTask.cpp')
| -rw-r--r-- | api/logic/InstanceCreationTask.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/InstanceCreationTask.cpp b/api/logic/InstanceCreationTask.cpp index 00156701..e7b0de7c 100644 --- a/api/logic/InstanceCreationTask.cpp +++ b/api/logic/InstanceCreationTask.cpp @@ -4,7 +4,6 @@ #include "FileSystem.h" //FIXME: remove this -#include "minecraft/MinecraftVersion.h" #include "minecraft/onesix/OneSixInstance.h" InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, BaseInstanceProvider* target, BaseVersionPtr version, @@ -21,12 +20,14 @@ InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, BaseInsta void InstanceCreationTask::executeTask() { setStatus(tr("Creating instance from version %1").arg(m_version->name())); + /* auto minecraftVersion = std::dynamic_pointer_cast<MinecraftVersion>(m_version); if(!minecraftVersion) { emitFailed(tr("The supplied version is not a Minecraft version.")); return ; } + */ QString stagingPath = m_target->getStagedInstancePath(); QDir rootDir(stagingPath); @@ -34,7 +35,6 @@ void InstanceCreationTask::executeTask() auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(stagingPath, "instance.cfg")); instanceSettings->registerSetting("InstanceType", "Legacy"); - auto mcVer = std::dynamic_pointer_cast<MinecraftVersion>(m_version); instanceSettings->set("InstanceType", "OneSix"); InstancePtr inst(new OneSixInstance(m_globalSettings, instanceSettings, stagingPath)); inst->setIntendedVersionId(m_version->descriptor()); |