From 3470a3df966100d4f1ea6488892ac048118a3131 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Fri, 31 May 2019 21:52:58 +0200 Subject: NOISSUE improve icon handling while importing and exporting instances Now it handles formats other than png. --- api/logic/InstanceImportTask.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'api/logic/InstanceImportTask.cpp') 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 // 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(); -- cgit