From 2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sat, 18 Nov 2006 12:28:10 +0000 Subject: [PATCH] start on device list, don't crash when list is empty --- lib/python/Screens/MediaPlayer.py | 13 ++++++++++--- 1 file 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)) -- 2.30.2