diff options
| author | Jonathan Bauer | 2016-02-25 14:40:26 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2016-02-25 14:40:26 +0100 |
| commit | 627310ad6a6fa14e80c3fa82ee28ed813a159070 (patch) | |
| tree | c5780474133c63a2a2531e93d932492352db033c /src/sessionsiconholder.cpp | |
| parent | Revert "load icon from the filesystem (if path is set in the xsession file)" (diff) | |
| download | vmchooser2-627310ad6a6fa14e80c3fa82ee28ed813a159070.tar.gz vmchooser2-627310ad6a6fa14e80c3fa82ee28ed813a159070.tar.xz vmchooser2-627310ad6a6fa14e80c3fa82ee28ed813a159070.zip | |
always look in the filesystem for the icon
vsession/xsession handle their fallback icon themselves
Diffstat (limited to 'src/sessionsiconholder.cpp')
| -rw-r--r-- | src/sessionsiconholder.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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(); } |