don't crash when there is no info

[enigma2.git] / lib / python / Screens / MediaPlayer.py

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index da50ae55e5bec0589a5b3f76bcc84763c165dd14..5a461848b58429595e9213b805cd70c46dcf8af6 100644 (file)
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -21,6 +21,7 @@ import os
 class MediaPlayer(Screen, InfoBarSeek):
        def __init__(self, session, args = None):
                Screen.__init__(self, session)
+               self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.stopService()
                
                self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave)", useServiceRef = True)
@@ -49,7 +50,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "NumberActions", "MediaPlayerSeekActions"],
                {
                        "ok": self.ok,
-                       "cancel": self.close,
+                       "cancel": self.exit,
                        
                        "right": self.rightDown,
                        "rightRepeated": self.doNothing,
@@ -115,6 +116,9 @@ class MediaPlayer(Screen, InfoBarSeek):
        def doNothing(self):
                pass
        
+       def exit(self):
+               self.close()
+       
        def checkSkipShowHideLock(self):
                self.updatedSeekState()
        
@@ -122,7 +126,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                self.nextEntry()
                
        def __onClose(self):
-               self.session.nav.playService(None)
+               self.session.nav.playService(self.oldService)
        
        def delMPTimer(self):
                del self.rightKeyTimer
@@ -307,15 +311,15 @@ class MediaPlayer(Screen, InfoBarSeek):
                self.playEntry()
        
        def playEntry(self):
-               currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
-               if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference():
-                       self.session.nav.playService(self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()])
-                       info = eServiceCenter.getInstance().info(currref)
-                       description = info.getInfoString(currref, iServiceInformation.sDescription)
-                       self["title"].setText(description)
-               self.unPauseService()
-               
-               
+               if len(self.playlist.getServiceRefList()):
+                       currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
+                       if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference():
+                               self.session.nav.playService(self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()])
+                               info = eServiceCenter.getInstance().info(currref)
+                               description = info and info.getInfoString(currref, iServiceInformation.sDescription) or ""
+                               self["title"].setText(description)
+                       self.unPauseService()
+                               
        def updatedSeekState(self):
                if self.seekstate == self.SEEK_STATE_PAUSE:
                        self.playlist.pauseFile()