diff options
| author | Alexander Lohnau <[email protected]> | 2020-06-23 08:22:42 +0200 |
|---|---|---|
| committer | Alexander Lohnau <[email protected]> | 2020-08-30 18:46:32 +0200 |
| commit | 004734e8321778a22a648e73b5d1743b64ca2bda (patch) | |
| tree | 6a94eb7f9a76bb547d953b749099fd992cccf585 | |
| parent | e42f42fa276533e1de4810b4461a084132cbdc70 (diff) | |
Fix file preview for desktop files with absolute icon paths
BUG: 423326
FIXED-IN: 20.08.1
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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) { |
