X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f86ab4565c7746aba49f0c606f8381bffb74f550..8bd6103bc110547cf683f931a1d9d7d14156bf98:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 6abb52d9..61c67038 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -3,7 +3,7 @@ from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap
 from EpgSelection import EPGSelection
-from enigma import eServiceReference
+from enigma import eServiceReference, eEPGCache, eEPGCachePtr
 
 from Screens.FixedMenu import FixedMenu
 
@@ -71,11 +71,11 @@ class ChannelSelection(Screen):
 				if action[:7] == "bouquet":
 					l = self.csel["list"]
 					l.setMode(l.MODE_NORMAL)
-					l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
+					l.setRoot(eServiceReference("1:7:1:0:0:0:0:0:0:0:" + action[8:]))
 				else:
 					ActionMap.action(self, contexts, action)
 
-		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions"], 
+		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.channelSelected,
@@ -87,7 +87,12 @@ class ChannelSelection(Screen):
 		self["actions"].csel = self
 
 	def showEPGList(self):
-		self.session.open(EPGSelection, self["list"].getCurrent())
+		ref=self["list"].getCurrent()
+		ptr=eEPGCache.getInstance()
+		if ptr.startTimeQuery(ref) != -1:
+			self.session.open(EPGSelection, ref)
+		else:
+			print 'no epg for service', ref.toString()
 
 	#  marked edit mode
 	def startMarkedEdit(self):