Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index c535e1b..596f2d5 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -241,7 +241,10 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
                for x in self.playlist.list:
                        self.playlistIOInternal.addService(ServiceReference(x[0]))
                if self.savePlaylistOnExit:
-                       self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
+                       try:
+                               self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
+                       except IOError:
+                               print "couldn't save playlist.e2pls"
                if config.mediaplayer.saveDirOnExit.getValue():
                        config.mediaplayer.defaultDir.setValue(self.filelist.getCurrentDirectory())
                        config.mediaplayer.defaultDir.save()

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index ba668f8..a1522dd 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -54,7 +54,7 @@ class Feedlist(MenuList):
 
        def isValid(self):
                l = self.l.getCurrentSelection()
-               if l[0] == 0:
+               if not l or l[0] == 0:
                        return False
                else:
                        return True

diff --git a/lib/python/Screens/HelpMenu.py b/lib/python/Screens/HelpMenu.py
index 74882a3..305e355 100644 (file)
--- a/lib/python/Screens/HelpMenu.py
+++ b/lib/python/Screens/HelpMenu.py
@@ -25,7 +25,8 @@ class HelpMenu(Screen, Rc):
        def SelectionChanged(self):
                self.clearSelectedKeys()
                selection = self["list"].getCurrent()
-               selection = selection[3]
+               if selection:
+                       selection = selection[3]
                #arrow = self["arrowup"]
                print "selection:", selection