summaryrefslogtreecommitdiffstats
path: root/logic/ftb/FTBPlugin.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-25 07:35:43 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-25 07:35:43 +0200
commit185ff238c202f3db20f013cd18cfbd99c9878e8e (patch)
tree72711e8017f94e5a45bbddf56d30a91f6c816474 /logic/ftb/FTBPlugin.cpp
parent09673cc16e73a5b126bdfd13e305c25c0ff993c2 (diff)
downloadMultiMC-185ff238c202f3db20f013cd18cfbd99c9878e8e.tar
MultiMC-185ff238c202f3db20f013cd18cfbd99c9878e8e.tar.gz
MultiMC-185ff238c202f3db20f013cd18cfbd99c9878e8e.tar.lz
MultiMC-185ff238c202f3db20f013cd18cfbd99c9878e8e.tar.xz
MultiMC-185ff238c202f3db20f013cd18cfbd99c9878e8e.zip
GH-992 GH-997 Do not rewrite values when loading FTB packs
name, icon and notes won't be overwritten when loading FTB packs this also eliminates the file saving delay from setting the values
Diffstat (limited to 'logic/ftb/FTBPlugin.cpp')
-rw-r--r--logic/ftb/FTBPlugin.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index ea663bab..0130b41e 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -161,13 +161,19 @@ InstancePtr loadInstance(SettingsObjectPtr globalSettings, QMap<QString, QString
inst->init();
qDebug() << "Init " << record.instanceDir;
inst->setGroupInitial("FTB");
+ /**
+ * FIXME: this does not respect the user's preferences. BUT, it would work nicely with the planned pack support
+ * -> instead of changing the user values, change pack values (defaults you can look at and revert to)
+ */
+ /*
inst->setName(record.name);
inst->setIconKey(record.iconKey);
+ inst->setNotes(record.description);
+ */
if (inst->intendedVersionId() != record.mcVersion)
{
inst->setIntendedVersionId(record.mcVersion);
}
- inst->setNotes(record.description);
qDebug() << "Post-Process " << record.instanceDir;
if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap))
{