X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d5dd14f2ea5cd28d4e21f763db7dd528d23f55a..32d530ac559b171b6d1885c1c7b5fa3aacbb7189:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 7ae50cd0..7c084d45 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -74,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
@@ -193,8 +194,13 @@ class Menu(Screen):
 		if menuID is not None:
 			# plugins
 			for l in plugins.getPluginsForMenu(menuID):
+				# check if a plugin overrides an existing menu
+				plugin_menuid = l[2]
+				for x in list:
+					if x[2] == plugin_menuid:
+						list.remove(x)
+						break
 				list.append((l[0], boundFunction(l[1], self.session), l[2], l[3] or 50))
-					
 
 		# for the skin: first try a menu_<menuID>, then Menu
 		self.skinName = [ ]