From cf43abc87ef56247e3012fa0d1fcefe7cb561824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 22 Jan 2017 15:20:05 +0100 Subject: GH-1794 Only write to the instance.cfg once after copying FTB instances. --- api/logic/minecraft/ftb/OneSixFTBInstance.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'api/logic/minecraft/ftb/OneSixFTBInstance.cpp') 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 -- cgit v1.2.3