Merge commit 'dm/experimental' into vuplus_experimental

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

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
old mode 100644 (file)
new mode 100755 (executable)
index 8ac5386..7ddbcbf
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -449,7 +449,7 @@ class ChannelSelectionEdit:
                                if mutableAlternatives:
                                        mutableAlternatives.setListName(name)
                                        if mutableAlternatives.addService(cur_service.ref):
-                                               print "add", cur_service.toString(), "to new alternatives failed"
+                                               print "add", cur_service.ref.toString(), "to new alternatives failed"
                                        mutableAlternatives.flushChanges()
                                        self.servicelist.addService(new_ref.ref, True)
                                        self.servicelist.removeCurrent()
@@ -1181,6 +1181,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
                self.servicelist.setPlayableIgnoreService(eServiceReference())
 
        def setMode(self):
+               self.rootChanged = True
                self.restoreRoot()
                lastservice=eServiceReference(self.lastservice.value)
                if lastservice.valid():
@@ -1445,6 +1446,10 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                #set previous tv service
                self.close(None)
 
+       #       ikseong - for add bouquet
+       def cancel(self):
+               self.closeRadio()
+               
        def __evServiceStart(self):
                service = self.session.nav.getCurrentService()
                if service:
@@ -1466,7 +1471,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                        config.radio.lastroot.save()
 
        def restoreRoot(self):
-               tmp = [x for x in self.lastroot.value.split(';') if x != '']
+               tmp = [x for x in config.radio.lastroot.value.split(';') if x != '']
                current = [x.toString() for x in self.servicePath]
                if tmp != current or self.rootChanged:
                        cnt = 0