disable some debug output

[enigma2.git] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 8b9f9b8caa6b4eea513fc131ddbe1770d9588d6a..1fe572e90f30ac57fbd92f358506c2114434d3f9 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -69,7 +69,6 @@ class ChannelSelection(Screen):
                class ChannelActionMap(ActionMap):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
-                                       print "setting root to " + action[8:]
                                        l = self.csel["list"]
                                        l.setMode(l.MODE_NORMAL)
                                        l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
@@ -97,7 +96,6 @@ class ChannelSelection(Screen):
                
                l = self["list"]
                for x in marked:
-                       print "mark: " + str(x)
                        l.addMarked(x)
                
        def endMarkedEdit(self, abort):
@@ -122,17 +120,21 @@ class ChannelSelection(Screen):
        
        # ...
        def channelSelected(self):
-               if not (self.movemode):
-                       self.session.nav.playService(self["list"].getCurrent())
-                       print "current: " + self["list"].getCurrent().toString()
-                       self.close()
-               else:
+               ref = self["list"].getCurrent()
+               if self.movemode:
                        if self.entry_marked:
                                self["list"].setCurrentMarked(False)
                                self.entry_marked = False
                        else:
                                self["list"].setCurrentMarked(True)
                                self.entry_marked = True
+               elif (ref.flags & 7) == 7:
+                       l = self["list"]
+                       l.setMode(l.MODE_NORMAL)
+                       l.setRoot(ref)
+               else:
+                       self.session.nav.playService(ref)
+                       self.close()
 
        #called from infoBar
        def zap(self):