From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Thu, 17 Apr 2008 23:00:45 +0000 (+0000)
Subject: search default picon png first in currently used skin directory before
X-Git-Tag: 2.6.0~1319
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1d85cc2be11283f9b08ec2172c13d1f5628d987b

search default picon png first in currently used skin directory before
fallback to default skin directory
---

diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index 27741d69..ca934c8e 100644
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -3,8 +3,7 @@
 ##
 from Renderer import Renderer
 from enigma import ePixmap
-from Components.config import config
-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/',
@@ -48,13 +47,10 @@ class Picon(Renderer):
 				if pngname == "": # no default yet in cache..
 					pngname = self.findPicon("picon_default")
 					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
+						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: