X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=skin.py;h=19da2036cebe63550b59db545901b0bf3bea9cc1;hp=a20f3eb8540821794ebe221fbc36f1f67dad6d1d;hb=ed545659e30ea7796e2e7acd06e766cc82efb486;hpb=7f65493b92e7e5a10c49cb4de595f6449382ffc8

diff --git a/skin.py b/skin.py
index a20f3eb..19da203 100755
--- a/skin.py
+++ b/skin.py
@@ -284,8 +284,8 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 				else:
 					bpp = 32
 				#print "Resolution:", xres,yres,bpp
-				from enigma import gFBDC
-				gFBDC.getInstance().setResolution(xres, yres)
+				from enigma import gMainDC
+				gMainDC.getInstance().setResolution(xres, yres)
 				desktop.resize(eSize(xres, yres))
 				if bpp != 32:
 					# load palette (not yet implemented)
@@ -402,10 +402,10 @@ def lookupScreen(name, style_id):
 		# first, find the corresponding screen element
 		for x in skin.findall("screen"):
 			if x.attrib.get('name', '') == name:
-				screen_style_id = x.attrib.get('id', None)
-				if screen_style_id is None and name.find('ummary') > 0:
-					screen_style_id = 1
-				if screen_style_id is None or int(screen_style_id) == style_id:
+				screen_style_id = x.attrib.get('id', '-1')
+				if screen_style_id == '-1' and name.find('ummary') > 0:
+					screen_style_id = '1'
+				if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id:
 					return x, path
 	return None, None
 
@@ -440,9 +440,10 @@ def readSkin(screen, skin, names, desktop):
 			skin_tuple = (skin_tuple,)
 		for sskin in skin_tuple:
 			parsedSkin = xml.etree.cElementTree.fromstring(sskin)
-			screen_style_id = parsedSkin.attrib.get('id', None)
-			if style_id != 2 or screen_style_id is None or int(screen_style_id) == style_id:
+			screen_style_id = parsedSkin.attrib.get('id', '-1')
+			if (style_id != 2 and int(screen_style_id) == -1) or int(screen_style_id) == style_id:
 				myscreen = screen.parsedSkin = parsedSkin
+				break
 
 	#assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
 	if myscreen is None: