X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bd2e4390946cda853f8d295b76d491d2d60bbe4a..b4d8c89302c67237b8a121a8f262e9db0022a9e7:/lib/python/Components/Renderer/Picon.py

diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index 6d97341d..bf52454a 100644
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -3,7 +3,8 @@
 ##
 from Renderer import Renderer
 from enigma import ePixmap
-from Tools.Directories import pathExists, fileExists, SCOPE_SKIN_IMAGE, resolveFilename
+from Components.config import config
+from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, resolveFilename
 
 class Picon(Renderer):
 	searchPaths = ['/usr/share/enigma2/%s/',
@@ -17,7 +18,6 @@ class Picon(Renderer):
 		self.pngname = ""
 
 	def applySkin(self, desktop):
-		print "-> Picon, applySkin:", self.skinAttributes
 		attribs = [ ]
 		for (attrib, value) in self.skinAttributes:
 			if attrib == "path":
@@ -30,7 +30,6 @@ class Picon(Renderer):
 	GUI_WIDGET = ePixmap
 
 	def changed(self, what):
-		print "PICON: path=%s" % self.path
 		if self.instance:
 			pngname = ""
 			if what[0] != self.CHANGED_CLEAR:
@@ -48,8 +47,15 @@ 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 == "":
+						pos = config.skin.primary_skin.value.rfind('/')
+						if pos != -1:
+							str = config.skin.primary_skin.value[:pos+1]
+							str += 'picon_default.png'
+							if fileExists(str):
+								pngname = str
+						if pngname == "": # Fallback to enigma2 logo
+							pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
 					self.nameCache["default"] = pngname
 			if self.pngname != pngname:
 				self.instance.setPixmapFromFile(pngname)