do not let create bouquets in favlist when multi bouquet mode ist disabled

[vuplus_dvbapp] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index cd15968..84e9951 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -9,9 +9,7 @@ from Components.config import config, configElement, ConfigSubsection, configTex
 from Screens.FixedMenu import FixedMenu
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager
-from Components.ServiceName import ServiceName
 from Components.Sources.Clock import Clock
-from Components.EventInfo import EventInfo
 from Components.Input import Input
 from Screens.InputBox import InputBox
 from ServiceReference import ServiceReference
@@ -91,14 +89,16 @@ class ChannelContextMenu(Screen):
                                        menu.append((_("remove service"), self.removeCurrentService))
                                if current_root.getPath().find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
                                        menu.append((_("remove new found flag"), self.removeNewFoundFlag))
-                       elif haveBouquets:
-                               menu.append((_("remove bouquet"), self.removeBouquet))
+
+                       if haveBouquets:
+                               menu.append((_("add bouquet..."), self.showBouquetInputBox))
+                               if inBouquetRootList:
+                                       menu.append((_("remove bouquet"), self.removeBouquet))
 
                if inBouquet: # current list is editable?
                        if not csel.bouquet_mark_edit:
                                if not csel.movemode:
                                        menu.append((_("enable move mode"), self.toggleMoveMode))
-                                       menu.append((_("add bouquet..."), self.showBouquetInputBox))
                                        if not inBouquetRootList:
                                                if haveBouquets:
                                                        menu.append((_("enable bouquet edit"), self.bouquetMarkStart))