From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Mon, 27 Sep 2010 13:18:55 +0000 (+0200)
Subject: refs bug #584
X-Git-Tag: 3.0.0~28^2~7
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/9213e54544d3782b1a4766960146f95988c517ed

refs bug #584
don't show "add service to bouquet" when inside bouquet view in multi bouquet mode and just one bouquet is set
don't show "add service to favourites" when inside favourite view (multi bouquet mode is disabled)
---

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 9ced5840..1c05bbf3 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -111,9 +111,16 @@ class ChannelContextMenu(Screen):
 						else:
 							append_when_current_valid(current, menu, (_("remove from parental protection"), boundFunction(self.removeParentalProtection, csel.getCurrentSelection())), level = 0)
 					if haveBouquets:
-						append_when_current_valid(current, menu, (_("add service to bouquet"), self.addServiceToBouquetSelected), level = 0)
+						bouquets = self.csel.getBouquetList()
+						if bouquets is None:
+							bouquetCnt = 0
+						else:
+							bouquetCnt = len(bouquets)
+						if not inBouquet or bouquetCnt > 1:
+							append_when_current_valid(current, menu, (_("add service to bouquet"), self.addServiceToBouquetSelected), level = 0)
 					else:
-						append_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected), level = 0)
+						if not inBouquet:
+							append_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected), level = 0)
 				else:
 					if current_root.getPath().find('FROM SATELLITES') != -1:
 						append_when_current_valid(current, menu, (_("remove selected satellite"), self.removeSatelliteServices), level = 0)