From 627310ad6a6fa14e80c3fa82ee28ed813a159070 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 25 Feb 2016 14:40:26 +0100 Subject: always look in the filesystem for the icon vsession/xsession handle their fallback icon themselves --- src/sessionsiconholder.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/sessionsiconholder.cpp') diff --git a/src/sessionsiconholder.cpp b/src/sessionsiconholder.cpp index 7cce455..67f1701 100644 --- a/src/sessionsiconholder.cpp +++ b/src/sessionsiconholder.cpp @@ -66,10 +66,11 @@ QIcon SessionsIconHolder::getIcon(const QString& name) { // else load icon from resource QIcon icon; QString resName(":" + name.toLower()); - if (QResource(resName + ".svg").isValid()) { - icon = QIcon(resName + ".svg"); - } else if (QResource(resName).isValid()) { - icon = QIcon(resName); + if (QResource(resName).isValid()) { + icon = QIcon(resName); + } else if (QFileInfo(name).isAbsolute() && QFile::exists(name)) { + // absolute icon path and file exists + icon = QIcon(name); } else { icon = QIcon(); } -- cgit v1.2.3-55-g7522