Merge branch 'Plasma/5.6'

10 years ago · a23a4291ed
parent 54ef12d601 3613733a93
commit a23a4291ed
1 changed files with 5 additions and 1 deletions
--- a/libtaskmanager/groupmanager.cpp
+++ b/libtaskmanager/groupmanager.cpp
@ -1077,7 +1077,11 @@ void GroupManager::setLauncherList(QList<QUrl> launcherList)
            pixmap.loadFromData(bytes);
            icon.addPixmap(pixmap);
        } else {
-            icon = QIcon::fromTheme(query.queryItemValue(QStringLiteral("icon")));
+            QString iconName = query.queryItemValue(QStringLiteral("icon"));
+
+            if (!iconName.isEmpty()) {
+                icon = QIcon::fromTheme(iconName);
+            }
        }

        l.setQuery(QUrlQuery());