diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2006-11-18 12:28:10 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2006-11-18 12:28:10 +0000 |
| commit | 2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492 (patch) | |
| tree | 48b469f91307f22c70290a028d4336e008f27e73 /lib/python/Screens/MediaPlayer.py | |
| parent | 4af9f774f193ba5d27e2415a3dcc8b0ddf3a170f (diff) | |
| download | enigma2-2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492.tar.gz enigma2-2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492.zip | |
start on device list, don't crash when list is empty
Diffstat (limited to 'lib/python/Screens/MediaPlayer.py')
| -rw-r--r-- | lib/python/Screens/MediaPlayer.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py index 7bde6840..1411b427 100644 --- a/lib/python/Screens/MediaPlayer.py +++ b/lib/python/Screens/MediaPlayer.py @@ -34,7 +34,8 @@ class MediaPlayer(Screen, InfoBarSeek): self.addPlaylistParser(PlaylistIOPLS, "pls") self.addPlaylistParser(PlaylistIOInternal, "e2pls") - self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True) + # 'None' is magic to start at the list of mountpoints + self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True) self["filelist"] = self.filelist self.playlist = PlayList() @@ -271,9 +272,15 @@ class MediaPlayer(Screen, InfoBarSeek): text = "" if self.currList == "filelist": if not self.filelist.canDescent(): - text = self.filelist.getServiceRef().getPath() + r = self.filelist.getServiceRef() + if r is None: + return + text = r.getPath() if self.currList == "playlist": - text = self.playlist.getSelection().getPath() + t = self.playlist.getSelection() + if t is None: + return + text = t.getPath() self["currenttext"].setText(os.path.basename(text)) |