summaryrefslogtreecommitdiffstats
path: root/logic/lists/InstanceList.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-31 01:24:28 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-31 01:32:51 +0100
commit952b63f68de93e8acf7aab81373661dae8d5098b (patch)
treea3be2560a2c34f8827a37998c7baa5a525dde22f /logic/lists/InstanceList.cpp
parentc44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc (diff)
downloadMultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.gz
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.lz
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.xz
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.zip
Refactor icon lists heavily
* Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
Diffstat (limited to 'logic/lists/InstanceList.cpp')
-rw-r--r--logic/lists/InstanceList.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp
index 0ecb387d..48a2865a 100644
--- a/logic/lists/InstanceList.cpp
+++ b/logic/lists/InstanceList.cpp
@@ -28,7 +28,7 @@
#include "MultiMC.h"
#include "logic/lists/InstanceList.h"
-#include "logic/lists/IconList.h"
+#include "logic/icons/IconList.h"
#include "logic/lists/MinecraftVersionList.h"
#include "logic/BaseInstance.h"
#include "logic/InstanceFactory.h"
@@ -356,12 +356,13 @@ void InstanceList::loadForgeInstances(QMap<QString, QString> groupMap)
QString iconKey = record.logo;
iconKey.remove(QRegularExpression("\\..*"));
- MMC->icons()->addIcon(iconKey, iconKey, PathCombine(templateDir, record.logo), true);
+ MMC->icons()->addIcon(iconKey, iconKey, PathCombine(templateDir, record.logo),
+ MMCIcon::Transient);
if (!QFileInfo(PathCombine(instanceDir, "instance.cfg")).exists())
{
BaseInstance *instPtr = NULL;
- auto & factory = InstanceFactory::get();
+ auto &factory = InstanceFactory::get();
auto version = MMC->minecraftlist()->findVersion(record.mcVersion);
if (!version)
{