0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1794 Only write to the instance.cfg once after copying FTB instances.

Browse Source
This commit is contained in:
Petr Mrázek 2017-01-22 15:20:05 +01:00
parent c421134d49
commit cf43abc87e
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/BaseInstance.h
View File

@ -67,7 +67,7 @@ public:
/// virtual destructor to make sure the destruction is COMPLETE /// virtual destructor to make sure the destruction is COMPLETE
virtual ~BaseInstance() {}; virtual ~BaseInstance() {};
virtual void copy(const QDir &newDir) {} virtual void copy(SettingsObjectPtr newSettings, const QDir &newDir) {}
virtual void init() = 0; virtual void init() = 0;

2
api/logic/InstanceCopyTask.cpp
View File

@ -51,7 +51,7 @@ void InstanceCopyTask::copyFinished()
instanceSettings->registerSetting("InstanceType", "Legacy"); instanceSettings->registerSetting("InstanceType", "Legacy");
// FIXME: and this too? errors??? // FIXME: and this too? errors???
m_origInstance->copy(m_stagingPath); m_origInstance->copy(instanceSettings, m_stagingPath);
InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath)); InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath));
inst->setName(m_instName); inst->setName(m_instName);

7
api/logic/minecraft/ftb/OneSixFTBInstance.cpp
View File

@ -15,7 +15,7 @@ OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsO
m_globalSettings = globalSettings; m_globalSettings = globalSettings;
} }
void OneSixFTBInstance::copy(const QDir &newDir) void OneSixFTBInstance::copy(SettingsObjectPtr newSettings, const QDir &newDir)
{ {
QStringList libraryNames; QStringList libraryNames;
// create patch file // create patch file
@ -94,10 +94,7 @@ void OneSixFTBInstance::copy(const QDir &newDir)
} }
} }
// now set the target instance to be plain OneSix // now set the target instance to be plain OneSix
INISettingsObject settings_obj(newDir.absoluteFilePath("instance.cfg")); newSettings->set("InstanceType", "OneSix");
settings_obj.registerSetting("InstanceType", "Legacy");
QString inst_type = settings_obj.get("InstanceType").toString();
settings_obj.set("InstanceType", "OneSix");
} }
QString OneSixFTBInstance::id() const QString OneSixFTBInstance::id() const

2
api/logic/minecraft/ftb/OneSixFTBInstance.h
View File

@ -9,7 +9,7 @@ public:
explicit OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); explicit OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
virtual ~OneSixFTBInstance(){}; virtual ~OneSixFTBInstance(){};
void copy(const QDir &newDir) override; void copy(SettingsObjectPtr newSettings, const QDir &newDir) override;
virtual void createProfile() override; virtual void createProfile() override;