fix typo to fix skin resolution change

[enigma2.git] / skin.py

diff --git a/skin.py b/skin.py
index 8789e877cac291941b2a140f8d60effe0dc05d23..f8a284f1cbea7f1557524e987736fc3a5a0de9b9 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -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)
@@ -370,7 +370,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):