diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-01-22 15:20:05 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-01-22 15:20:05 +0100 |
| commit | cf43abc87ef56247e3012fa0d1fcefe7cb561824 (patch) | |
| tree | 5bdb1d1f4ed0f53f63f4cf65c0365af7982953e7 /api/logic/minecraft/ftb | |
| parent | c421134d4984f06275b1a9d35b3dd6e345d23d21 (diff) | |
| download | MultiMC-cf43abc87ef56247e3012fa0d1fcefe7cb561824.tar MultiMC-cf43abc87ef56247e3012fa0d1fcefe7cb561824.tar.gz MultiMC-cf43abc87ef56247e3012fa0d1fcefe7cb561824.tar.lz MultiMC-cf43abc87ef56247e3012fa0d1fcefe7cb561824.tar.xz MultiMC-cf43abc87ef56247e3012fa0d1fcefe7cb561824.zip | |
GH-1794 Only write to the instance.cfg once after copying FTB instances.
Diffstat (limited to 'api/logic/minecraft/ftb')
| -rw-r--r-- | api/logic/minecraft/ftb/OneSixFTBInstance.cpp | 7 | ||||
| -rw-r--r-- | api/logic/minecraft/ftb/OneSixFTBInstance.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/api/logic/minecraft/ftb/OneSixFTBInstance.cpp b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp index 5edad080..edf31eb7 100644 --- a/api/logic/minecraft/ftb/OneSixFTBInstance.cpp +++ b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp @@ -15,7 +15,7 @@ OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsO m_globalSettings = globalSettings; } -void OneSixFTBInstance::copy(const QDir &newDir) +void OneSixFTBInstance::copy(SettingsObjectPtr newSettings, const QDir &newDir) { QStringList libraryNames; // create patch file @@ -94,10 +94,7 @@ void OneSixFTBInstance::copy(const QDir &newDir) } } // now set the target instance to be plain OneSix - INISettingsObject settings_obj(newDir.absoluteFilePath("instance.cfg")); - settings_obj.registerSetting("InstanceType", "Legacy"); - QString inst_type = settings_obj.get("InstanceType").toString(); - settings_obj.set("InstanceType", "OneSix"); + newSettings->set("InstanceType", "OneSix"); } QString OneSixFTBInstance::id() const diff --git a/api/logic/minecraft/ftb/OneSixFTBInstance.h b/api/logic/minecraft/ftb/OneSixFTBInstance.h index a5621685..640f609c 100644 --- a/api/logic/minecraft/ftb/OneSixFTBInstance.h +++ b/api/logic/minecraft/ftb/OneSixFTBInstance.h @@ -9,7 +9,7 @@ public: explicit OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); virtual ~OneSixFTBInstance(){}; - void copy(const QDir &newDir) override; + void copy(SettingsObjectPtr newSettings, const QDir &newDir) override; virtual void createProfile() override; |