From 37df39b93bf23b89ca760d4dd793788833d9a3e1 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Tue, 23 Jun 2020 08:22:42 +0200 Subject: [PATCH] Fix file preview for desktop files with absolute icon paths BUG: 423326 --- src/kitemviews/kstandarditemlistwidget.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 13f80996d..15a618207 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) { -- 2.47.3