From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Tue, 23 Jun 2020 06:22:42 +0000 (+0200)
Subject: Fix file preview for desktop files with absolute icon paths
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/004734e8321778a22a648e73b5d1743b64ca2bda?ds=inline

Fix file preview for desktop files with absolute icon paths

BUG: 423326
FIXED-IN: 20.08.1
---

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 214cc3755..3faf786c9 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -1487,7 +1487,13 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
     QPixmap pixmap;
 
     if (!QPixmapCache::find(key, &pixmap)) {
-        const QIcon icon = QIcon::fromTheme(name, fallbackIcon);
+        QIcon icon = QIcon::fromTheme(name);
+        if (icon.isNull()) {
+            icon = QIcon(name);
+        }
+        if (icon.isNull()) {
+            icon = fallbackIcon;
+        }
 
         pixmap = icon.pixmap(size / qApp->devicePixelRatio(), size / qApp->devicePixelRatio(), mode);
         if (pixmap.width() != size || pixmap.height() != size) {