diff options
| author | Petr Mrázek <peterix@gmail.com> | 2019-05-31 21:52:58 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2019-05-31 21:53:58 +0200 |
| commit | 3470a3df966100d4f1ea6488892ac048118a3131 (patch) | |
| tree | fc0f649f4bba0859f7f38d2b81876fd52a8266a2 /api/logic/InstanceImportTask.cpp | |
| parent | 61913daaf3b21960de13340a6069bc3daca8744a (diff) | |
| download | PrismLauncher-3470a3df966100d4f1ea6488892ac048118a3131.tar.gz PrismLauncher-3470a3df966100d4f1ea6488892ac048118a3131.tar.bz2 PrismLauncher-3470a3df966100d4f1ea6488892ac048118a3131.zip | |
NOISSUE improve icon handling while importing and exporting instances
Now it handles formats other than png.
Diffstat (limited to 'api/logic/InstanceImportTask.cpp')
| -rw-r--r-- | api/logic/InstanceImportTask.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/api/logic/InstanceImportTask.cpp b/api/logic/InstanceImportTask.cpp index bbab557a..1e93174c 100644 --- a/api/logic/InstanceImportTask.cpp +++ b/api/logic/InstanceImportTask.cpp @@ -6,6 +6,7 @@ #include "NullInstance.h" #include "settings/INISettingsObject.h" #include "icons/IIconList.h" +#include "icons/IconUtils.h" #include <QtConcurrentRun> // FIXME: this does not belong here, it's Minecraft/Flame specific @@ -393,8 +394,9 @@ void InstanceImportTask::processMultiMC() else { m_instIcon = instance.iconKey(); - auto importIconPath = FS::PathCombine(instance.instanceRoot(), m_instIcon + ".png"); - if (QFile::exists(importIconPath)) + + auto importIconPath = IconUtils::findBestIconIn(instance.instanceRoot(), m_instIcon); + if (!importIconPath.isNull() && QFile::exists(importIconPath)) { // import icon auto iconList = ENV.icons(); |