diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-05-03 00:27:28 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-05-03 00:27:28 +0200 |
| commit | e1a530f84dce9b4c1b262669157359fbbd436428 (patch) | |
| tree | cc372ad70b91977d1f038fe835a139cdf6bfb7d1 /api/logic/minecraft | |
| parent | c50b3cdeec1ce30de7c67f62f026d689afe6930a (diff) | |
| download | MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar.gz MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar.lz MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar.xz MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.zip | |
GH-1559 Fix FTB icons
This was caused by separation of GUI and logic. Now logic has an interface that GUI implements.
It should be expanded upon later.
Diffstat (limited to 'api/logic/minecraft')
| -rw-r--r-- | api/logic/minecraft/ftb/FTBPlugin.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/api/logic/minecraft/ftb/FTBPlugin.cpp b/api/logic/minecraft/ftb/FTBPlugin.cpp index a142c106..134257bf 100644 --- a/api/logic/minecraft/ftb/FTBPlugin.cpp +++ b/api/logic/minecraft/ftb/FTBPlugin.cpp @@ -257,7 +257,11 @@ void FTBPlugin::loadInstances(SettingsObjectPtr globalSettings, QMap<QString, QS { qDebug() << "Loading FTB instance from " << record.instanceDir; QString iconKey = record.iconKey; - // MMC->icons()->addIcon(iconKey, iconKey, FS::PathCombine(record.templateDir, record.logo), MMCIcon::Transient); + auto icons = ENV.icons(); + if(icons) + { + icons->addIcon(iconKey, iconKey, FS::PathCombine(record.templateDir, record.logo), IconType::Transient); + } auto settingsFilePath = FS::PathCombine(record.instanceDir, "instance.cfg"); qDebug() << "ICON get!"; |