git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4af9f77
)
start on device list, don't crash when list is empty
author
Felix Domke
<tmbinc@elitedvb.net>
Sat, 18 Nov 2006 12:28:10 +0000
(12:28 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sat, 18 Nov 2006 12:28:10 +0000
(12:28 +0000)
lib/python/Screens/MediaPlayer.py
patch
|
blob
|
history
diff --git
a/lib/python/Screens/MediaPlayer.py
b/lib/python/Screens/MediaPlayer.py
index 7bde68407bcece8922ed3b062bed42b350df67d6..1411b427d4d1ca19fc0a14a722d274431f8c152f 100644
(file)
--- 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.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()
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 = ""
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":
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))
self["currenttext"].setText(os.path.basename(text))