diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-09-05 23:38:17 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-09-05 23:38:17 +0200 |
| commit | b61407a75d06abd61ce89f972581fa36a961d906 (patch) | |
| tree | 8c7f113a053e5f660756bda2f11cbda5b8af6985 /api/logic/InstanceCreationTask.cpp | |
| parent | d80382180ef14d814eb9f6d7f2bf5db362f25cc2 (diff) | |
| download | MultiMC-b61407a75d06abd61ce89f972581fa36a961d906.tar MultiMC-b61407a75d06abd61ce89f972581fa36a961d906.tar.gz MultiMC-b61407a75d06abd61ce89f972581fa36a961d906.tar.lz MultiMC-b61407a75d06abd61ce89f972581fa36a961d906.tar.xz MultiMC-b61407a75d06abd61ce89f972581fa36a961d906.zip | |
NOISSUE retry committing instances if it fails a few times
This should fix issues with antivirus locking files/folders on Windows.
Diffstat (limited to 'api/logic/InstanceCreationTask.cpp')
| -rw-r--r-- | api/logic/InstanceCreationTask.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/api/logic/InstanceCreationTask.cpp b/api/logic/InstanceCreationTask.cpp index a615d6ff..a7ea1e66 100644 --- a/api/logic/InstanceCreationTask.cpp +++ b/api/logic/InstanceCreationTask.cpp @@ -6,11 +6,11 @@ //FIXME: remove this #include "minecraft/onesix/OneSixInstance.h" -InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, BaseInstanceProvider* target, BaseVersionPtr version, +InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, const QString & stagingPath, BaseVersionPtr version, const QString& instName, const QString& instIcon, const QString& instGroup) { m_globalSettings = settings; - m_target = target; + m_stagingPath = stagingPath; m_instName = instName; m_instIcon = instIcon; m_instGroup = instGroup; @@ -20,19 +20,17 @@ InstanceCreationTask::InstanceCreationTask(SettingsObjectPtr settings, BaseInsta void InstanceCreationTask::executeTask() { setStatus(tr("Creating instance from version %1").arg(m_version->name())); - - QString stagingPath = m_target->getStagedInstancePath(); - QDir rootDir(stagingPath); - - auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(stagingPath, "instance.cfg")); - instanceSettings->registerSetting("InstanceType", "Legacy"); - - instanceSettings->set("InstanceType", "OneSix"); - InstancePtr inst(new OneSixInstance(m_globalSettings, instanceSettings, stagingPath)); - inst->setIntendedVersionId(m_version->descriptor()); - inst->setName(m_instName); - inst->setIconKey(m_instIcon); - inst->init(); - m_target->commitStagedInstance(stagingPath, m_instName, m_instGroup); + { + auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg")); + instanceSettings->suspendSave(); + instanceSettings->registerSetting("InstanceType", "Legacy"); + instanceSettings->set("InstanceType", "OneSix"); + OneSixInstance inst(m_globalSettings, instanceSettings, m_stagingPath); + inst.setIntendedVersionId(m_version->descriptor()); + inst.setName(m_instName); + inst.setIconKey(m_instIcon); + inst.init(); + instanceSettings->resumeSave(); + } emitSucceeded(); } |