aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-02-26 23:27:10 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-02-26 23:27:10 +0000
commit6d98961bd858aa420415c8f1737e9e750794344c (patch)
tree33e535a36c1416022f8cac14b4e7497dfb70c45d /lib/python
parent41c90671f123813d65bbcc877fb3659e889e0376 (diff)
downloadenigma2-6d98961bd858aa420415c8f1737e9e750794344c.tar.gz
enigma2-6d98961bd858aa420415c8f1737e9e750794344c.zip
fix movielist selection when there is no (selected) item
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/MovieList.py3
-rw-r--r--lib/python/Screens/MovieSelection.py15
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 82d2c56b..bc659114 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 079f5ebd..1701edb3 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)