X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e8964009640203424b6180a0e93857062c01c166..cf630f0cd1366036ae201702b177bfe95de3d03f:/skin.py diff --git a/skin.py b/skin.py index 5f27acca..3497cc11 100644 --- a/skin.py +++ b/skin.py @@ -210,12 +210,12 @@ def readSkin(screen, skin, name, desktop): myscreen = x del skin - if myscreen is None: - # try embedded skin - if "parsedSkin" in screen.__dict__: - myscreen = screen.parsedSkin - elif "skin" in screen.__dict__: - myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0] + # try embedded skin + myscreen = myscreen or getattr(screen, "parsedSkin", None) + + # try uncompiled embedded skin + if myscreen is None and getattr(screen, "skin", None): + myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0] assert myscreen is not None, "no skin for screen '" + name + "' found!"