X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2e62e4d78ea265cafc1021b46f3b35e55a2140dd..896d63aa5605a9b6ef641830eae4038addc53c60:/lib/python/Components/Renderer/Picon.py diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py index d5212638..ca934c8e 100644 --- a/lib/python/Components/Renderer/Picon.py +++ b/lib/python/Components/Renderer/Picon.py @@ -3,7 +3,7 @@ ## from Renderer import Renderer from enigma import ePixmap -from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, resolveFilename +from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, SCOPE_CURRENT_SKIN, resolveFilename class Picon(Renderer): searchPaths = ['/usr/share/enigma2/%s/', @@ -46,8 +46,12 @@ class Picon(Renderer): pngname = self.nameCache.get("default", "") if pngname == "": # no default yet in cache.. pngname = self.findPicon("picon_default") - if pngname == "": # Fallback to enigma2 logo - pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png") + if pngname == "": + tmp = resolveFilename(SCOPE_CURRENT_SKIN, "picon_default.png") + if fileExists(tmp): + pngname = tmp + else: + pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/picon_default.png") self.nameCache["default"] = pngname if self.pngname != pngname: self.instance.setPixmapFromFile(pngname)