From 6d98961bd858aa420415c8f1737e9e750794344c Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sun, 26 Feb 2006 23:27:10 +0000 Subject: [PATCH] fix movielist selection when there is no (selected) item --- lib/python/Components/MovieList.py | 3 ++- lib/python/Screens/MovieSelection.py | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py index 82d2c56..bc65911 100644 --- a/lib/python/Components/MovieList.py +++ b/lib/python/Components/MovieList.py @@ -63,7 +63,8 @@ class MovieList(HTMLComponent, GUIComponent): return self.instance.getCurrentIndex() def getCurrent(self): - return self.l.getCurrentSelection()[0] + l = self.l.getCurrentSelection() + return l and l[0] def GUIcreate(self, parent): self.instance = eListbox(parent) diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py index 079f5eb..1701edb 100644 --- a/lib/python/Screens/MovieSelection.py +++ b/lib/python/Screens/MovieSelection.py @@ -92,7 +92,9 @@ class MovieSelection(Screen): self.onShown.append(self.go) def go(self): - self.delayTimer.start(0, 1) + # ouch. this should redraw our "Please wait..."-text. + # this is of course not the right way to do this. + self.delayTimer.start(10, 1) def updateHDDData(self): self["list"].reload(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD))) @@ -106,13 +108,18 @@ class MovieSelection(Screen): self["list"].moveTo(self.selectedmovie) def getCurrent(self): - return self["list"].getCurrent()[0] + l = self["list"].getCurrent() + return l and l[0] def movieSelected(self): - self.close(self.getCurrent()) + current = self.getCurrent() + if current is not None: + self.close(current) def doContext(self): - self.session.open(ChannelContextMenu, self, self.getCurrent()) + current = self.getCurrent() + if current is not None: + self.session.open(ChannelContextMenu, self, ) def abort(self): self.close(None) -- 2.7.4