X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpython%2FScreens%2FChannelSelection.py;h=7ddbcbfa20dde5b9c8df8dc4feaab54e8a2b5d74;hb=7ff2c7908114488178ad574b23fcee718515f4fb;hp=eb03ee655493593720d58c23d407a9926d64143a;hpb=79b95a25d1fd0d555b393dd5b9bac83b60432df6;p=vuplus_dvbapp diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py old mode 100644 new mode 100755 index eb03ee6..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() @@ -1446,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: @@ -1467,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