git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow overriding menus from plugins
[enigma2.git]
/
lib
/
python
/
Screens
/
Menu.py
diff --git
a/lib/python/Screens/Menu.py
b/lib/python/Screens/Menu.py
index 19b36045cb1c4cb745911de540975d64cf1f1a19..9f0db4254d9318698df21a78e07c7fb3a822b568 100644
(file)
--- a/
lib/python/Screens/Menu.py
+++ b/
lib/python/Screens/Menu.py
@@
-194,8
+194,14
@@
class Menu(Screen):
if menuID is not None:
# plugins
for l in plugins.getPluginsForMenu(menuID):
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:
+ print x[2], plugin_menuid
+ if x[2] == plugin_menuid:
+ list.remove(x)
+ break
list.append((l[0], boundFunction(l[1], self.session), l[2], l[3] or 50))
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 = [ ]
# for the skin: first try a menu_<menuID>, then Menu
self.skinName = [ ]