handle multiple configuration files correctly. Patch by Pieter Grimmerink

[enigma2.git] / skin.py

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