git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add list not empty check
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBarGenerics.py
diff --git
a/lib/python/Screens/InfoBarGenerics.py
b/lib/python/Screens/InfoBarGenerics.py
index d621d12e667231831f16e2af51c112b1db8dc658..c3c6e21abd6ce0d94d65f53278f4f0c3bcd61cb1 100644
(file)
--- a/
lib/python/Screens/InfoBarGenerics.py
+++ b/
lib/python/Screens/InfoBarGenerics.py
@@
-448,7
+448,8
@@
class InfoBarEPG:
if self.is_now_next and len(self.dlg_stack) == 1:
self.getNowNext()
assert self.eventView
if self.is_now_next and len(self.dlg_stack) == 1:
self.getNowNext()
assert self.eventView
- self.eventView.setEvent(self.epglist[0])
+ if len(self.epglist):
+ self.eventView.setEvent(self.epglist[0])
def openEventView(self):
ref = self.session.nav.getCurrentlyPlayingServiceReference()
def openEventView(self):
ref = self.session.nav.getCurrentlyPlayingServiceReference()
@@
-1241,14
+1242,13
@@
class InfoBarSubserviceSelection:
}, -1)
self["SubserviceQuickzapAction"].setEnabled(False)
}, -1)
self["SubserviceQuickzapAction"].setEnabled(False)
- self.session.nav.event.append(self.check
Parent
Avail) # we like to get service events
+ self.session.nav.event.append(self.check
Subservices
Avail) # we like to get service events
- def checkParentAvail(self, ev):
- ref=self.session.nav.getCurrentlyPlayingServiceReference()
+ def checkSubservicesAvail(self, ev):
if ev == iPlayableService.evUpdatedEventInfo:
if ev == iPlayableService.evUpdatedEventInfo:
- if ref.getData(5):
-
self["SubserviceQuickzapAction"].setEnabled(True
)
-
else
:
+ service = self.session.nav.getCurrentService()
+
subservices = service.subServices(
)
+
if subservices.getNumberOfSubservices() == 0
:
self["SubserviceQuickzapAction"].setEnabled(False)
def nextSubservice(self):
self["SubserviceQuickzapAction"].setEnabled(False)
def nextSubservice(self):
@@
-1275,6
+1275,8
@@
class InfoBarSubserviceSelection:
selection=n-1
newservice = subservices.getSubservice(selection)
if newservice.valid():
selection=n-1
newservice = subservices.getSubservice(selection)
if newservice.valid():
+ del subservices
+ del service
self.session.nav.playService(newservice)
def subserviceSelection(self):
self.session.nav.playService(newservice)
def subserviceSelection(self):
@@
-1296,6
+1298,7
@@
class InfoBarSubserviceSelection:
def subserviceSelected(self, service):
if not service is None:
def subserviceSelected(self, service):
if not service is None:
+ self["SubserviceQuickzapAction"].setEnabled(True)
self.session.nav.playService(service[1])
class InfoBarAdditionalInfo:
self.session.nav.playService(service[1])
class InfoBarAdditionalInfo: