summaryrefslogtreecommitdiffstats
path: root/logic/ftb
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-24 19:48:22 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-24 19:48:22 +0200
commit09673cc16e73a5b126bdfd13e305c25c0ff993c2 (patch)
treebdd377ad9c1701ae140b3446dd8e64457993152d /logic/ftb
parentdfb0a3b724f624532557fe7cb20e8678560f444c (diff)
downloadMultiMC-09673cc16e73a5b126bdfd13e305c25c0ff993c2.tar
MultiMC-09673cc16e73a5b126bdfd13e305c25c0ff993c2.tar.gz
MultiMC-09673cc16e73a5b126bdfd13e305c25c0ff993c2.tar.lz
MultiMC-09673cc16e73a5b126bdfd13e305c25c0ff993c2.tar.xz
MultiMC-09673cc16e73a5b126bdfd13e305c25c0ff993c2.zip
GH-977 Initialize FTB icon properly (iconKey vs logo), remove debug prints
Diffstat (limited to 'logic/ftb')
-rw-r--r--logic/ftb/FTBPlugin.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index ffac46f7..ea663bab 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -161,16 +161,12 @@ InstancePtr loadInstance(SettingsObjectPtr globalSettings, QMap<QString, QString
inst->init();
qDebug() << "Init " << record.instanceDir;
inst->setGroupInitial("FTB");
- qDebug() << "A " << record.instanceDir;
inst->setName(record.name);
- qDebug() << "B " << record.instanceDir;
inst->setIconKey(record.iconKey);
- qDebug() << "C " << record.instanceDir;
if (inst->intendedVersionId() != record.mcVersion)
{
inst->setIntendedVersionId(record.mcVersion);
}
- qDebug() << "D " << record.instanceDir;
inst->setNotes(record.description);
qDebug() << "Post-Process " << record.instanceDir;
if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap))
@@ -222,7 +218,7 @@ InstancePtr createInstance(SettingsObjectPtr globalSettings, QMap<QString, QStri
}
inst->setGroupInitial("FTB");
inst->setName(record.name);
- inst->setIconKey(record.logo);
+ inst->setIconKey(record.iconKey);
inst->setIntendedVersionId(record.mcVersion);
inst->setNotes(record.description);
qDebug() << "Post-Process " << record.instanceDir;