fix screens without a module

[enigma2.git] / lib / python / Screens / Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 4ad36d18a73c78b5d6a7ca3049f6d860598482bf..a12571e7c0ed58ebe835ffdb137e8070f7133fbe 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -91,7 +91,8 @@ class Menu(Screen):
                #        plus possible arguments, as 
                #        string (as we want to reference 
                #        stuff which is just imported)
                #        plus possible arguments, as 
                #        string (as we want to reference 
                #        stuff which is just imported)

-               # FIXME. somehow.
+               # FIXME. somehow
+               print arg

                if arg[0] != "":
                        exec "from " + arg[0] + " import *"
                        
                if arg[0] != "":
                        exec "from " + arg[0] + " import *"
                        


@@ -120,11 +121,14 @@ class Menu(Screen):
                                if x.nodeType != xml.dom.minidom.Element.nodeType:
                                        continue
                                elif x.tagName == 'screen':
                                if x.nodeType != xml.dom.minidom.Element.nodeType:
                                        continue
                                elif x.tagName == 'screen':

-                                       module = "Screens." + getValbyAttr(x, "module")
+                                       module = getValbyAttr(x, "module")

                                        screen = getValbyAttr(x, "screen")
 
                                        if len(screen) == 0:
                                                screen = module
                                        screen = getValbyAttr(x, "screen")
 
                                        if len(screen) == 0:
                                                screen = module

+
+                                       if module != "":
+                                               module = "Screens." + module

                                        
                                        # check for arguments. they will be appended to the 
                                        # openDialog call
                                        
                                        # check for arguments. they will be appended to the 
                                        # openDialog call