diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-02 14:17:44 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-02 14:17:44 +0100 |
| commit | cdd35910c3aeb4048e2e982db0b8227f76574704 (patch) | |
| tree | 0f4086f8e7d27ac523751dc8356edff712be9cc2 /logic/OneSixInstance.cpp | |
| parent | ece826bdbc5ca525e253cafcfef3d93e492949f5 (diff) | |
| download | MultiMC-cdd35910c3aeb4048e2e982db0b8227f76574704.tar MultiMC-cdd35910c3aeb4048e2e982db0b8227f76574704.tar.gz MultiMC-cdd35910c3aeb4048e2e982db0b8227f76574704.tar.lz MultiMC-cdd35910c3aeb4048e2e982db0b8227f76574704.tar.xz MultiMC-cdd35910c3aeb4048e2e982db0b8227f76574704.zip | |
Fix installing forge after liteloader and then removing liteloader. Also formatting.
Diffstat (limited to 'logic/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 8ecbe7a0..ae172f21 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -35,7 +35,7 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings, d->m_settings->registerSetting("IntendedVersion", ""); d->m_settings->registerSetting("ShouldUpdate", false); d->version.reset(new OneSixVersion(this, this)); - d->nonCustomVersion.reset(new OneSixVersion(this, this)); + d->vanillaVersion.reset(new OneSixVersion(this, this)); if (QDir(instanceRoot()).exists("version.json")) { reloadVersion(); @@ -321,7 +321,7 @@ bool OneSixInstance::reloadVersion(QWidget *widgetParent) bool ret = d->version->reload(widgetParent); if (ret) { - ret = d->nonCustomVersion->reload(widgetParent, true); + ret = d->vanillaVersion->reload(widgetParent, true); } emit versionReloaded(); return ret; @@ -331,7 +331,7 @@ void OneSixInstance::clearVersion() { I_D(OneSixInstance); d->version->clear(); - d->nonCustomVersion->clear(); + d->vanillaVersion->clear(); emit versionReloaded(); } @@ -341,10 +341,10 @@ std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion() const return d->version; } -std::shared_ptr<OneSixVersion> OneSixInstance::getNonCustomVersion() const +std::shared_ptr<OneSixVersion> OneSixInstance::getVanillaVersion() const { I_D(const OneSixInstance); - return d->nonCustomVersion; + return d->vanillaVersion; } QString OneSixInstance::defaultBaseJar() const |