X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=skin.py;h=97954715c4d94f6a1f765cfb4ec708f8aa88f8d0;hb=aeb5b72d0ce4bdaf01310117eefd99f03558112f;hp=8789e877cac291941b2a140f8d60effe0dc05d23;hpb=fe0534f76b59b814caca3648933c45d3add31889;p=vuplus_dvbapp

diff --git a/skin.py b/skin.py
index 8789e87..9795471 100644
--- a/skin.py
+++ b/skin.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile
 profile("LOAD:ElementTree")
 import xml.etree.cElementTree
 from os import path
@@ -14,7 +14,7 @@ from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCO
 from Tools.Import import my_import
 from Tools.LoadPixmap import LoadPixmap
 
-from Tools.XMLTools import elementsWithTag, mergeText
+from Tools.XMLTools import mergeText
 
 colorNames = dict()
 
@@ -237,7 +237,7 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 			id = 0
 		if id == 0: # framebuffer
 			for res in c.findall("resolution"):
-				get_attr = c.attrib.get
+				get_attr = res.attrib.get
 				xres = get_attr("xres")
 				if xres:
 					xres = int(xres)
@@ -256,6 +256,7 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 				#print "Resolution:", xres,yres,bpp
 				from enigma import gFBDC
 				gFBDC.getInstance().setResolution(xres, yres)
+				desktop.resize(eSize(xres, yres))
 				if bpp != 32:
 					# load palette (not yet implemented)
 					pass
@@ -370,7 +371,8 @@ def readSkin(screen, skin, names, desktop):
 			break
 
 	# otherwise try embedded skin
-	myscreen = myscreen or getattr(screen, "parsedSkin", None)
+	if myscreen is None:
+		myscreen = getattr(screen, "parsedSkin", None)
 
 	# try uncompiled embedded skin
 	if myscreen is None and getattr(screen, "skin", None):