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

GH-977 Initialize FTB icon properly (iconKey vs logo), remove debug prints

Browse Source
This commit is contained in:
Petr Mrázek 2015-05-24 19:48:22 +02:00
parent dfb0a3b724
commit 09673cc16e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
logic/ftb/FTBPlugin.cpp
View File

@ -161,16 +161,12 @@ InstancePtr loadInstance(SettingsObjectPtr globalSettings, QMap<QString, QString
inst->init(); inst->init();
qDebug() << "Init " << record.instanceDir; qDebug() << "Init " << record.instanceDir;
inst->setGroupInitial("FTB"); inst->setGroupInitial("FTB");
qDebug() << "A " << record.instanceDir;
inst->setName(record.name); inst->setName(record.name);
qDebug() << "B " << record.instanceDir;
inst->setIconKey(record.iconKey); inst->setIconKey(record.iconKey);
qDebug() << "C " << record.instanceDir;
if (inst->intendedVersionId() != record.mcVersion) if (inst->intendedVersionId() != record.mcVersion)
{ {
inst->setIntendedVersionId(record.mcVersion); inst->setIntendedVersionId(record.mcVersion);
} }
qDebug() << "D " << record.instanceDir;
inst->setNotes(record.description); inst->setNotes(record.description);
qDebug() << "Post-Process " << record.instanceDir; qDebug() << "Post-Process " << record.instanceDir;
if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap)) if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap))
@ -222,7 +218,7 @@ InstancePtr createInstance(SettingsObjectPtr globalSettings, QMap<QString, QStri
} }
inst->setGroupInitial("FTB"); inst->setGroupInitial("FTB");
inst->setName(record.name); inst->setName(record.name);
inst->setIconKey(record.logo); inst->setIconKey(record.iconKey);
inst->setIntendedVersionId(record.mcVersion); inst->setIntendedVersionId(record.mcVersion);
inst->setNotes(record.description); inst->setNotes(record.description);
qDebug() << "Post-Process " << record.instanceDir; qDebug() << "Post-Process " << record.instanceDir;