X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/34be902fbb3d1809348ef3b88b2d6617d34e524b..edf2e7b1a646ca0a35ac2bc92e97a4b4b29c74f7:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 22aee7d9..19b36045 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -4,6 +4,7 @@ from Components.ActionMap import NumberActionMap
 from Components.Sources.StaticText import StaticText
 from Components.config import configfile
 from Components.PluginComponent import plugins
+from Components.config import config
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
@@ -73,7 +74,8 @@ class Menu(Screen):
 	def okbuttonClick(self):
 		print "okbuttonClick"
 		selection = self["menu"].getCurrent()
-		selection[1]()
+		if selection is not None:
+			selection[1]()
 
 	def execText(self, text):
 		exec text
@@ -170,8 +172,10 @@ class Menu(Screen):
 			if x.nodeType != xml.dom.minidom.Element.nodeType:
 			    continue
 			elif x.tagName == 'item':
-				self.addItem(list, x)
-				count += 1
+				item_level = int(x.getAttribute("level") or "0")
+				if item_level <= config.usage.setup_level.index:
+					self.addItem(list, x)
+					count += 1
 			elif x.tagName == 'menu':
 				self.addMenu(list, x)
 				count += 1