don't crash when removing a marker from bouquet list
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 23 Nov 2006 21:18:26 +0000 (21:18 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 23 Nov 2006 21:18:26 +0000 (21:18 +0000)
lib/python/Screens/ChannelSelection.py

index 4430edd0cb81fee81cd375da93e8871f88bdb898..c376d4fa26e7a414ea73969743b597dbd3d2fe70 100644 (file)
@@ -361,6 +361,7 @@ class ChannelSelectionEdit:
                refstr = self.getCurrentSelection().toString()
                self.bouquetNumOffsetCache = { }
                pos = refstr.find('FROM BOUQUET "')
+               filename = None
                if pos != -1:
                        refstr = refstr[pos+14:]
                        pos = refstr.find('"')
@@ -368,7 +369,8 @@ class ChannelSelectionEdit:
                                filename = '/etc/enigma2/' + refstr[:pos] # FIXMEEE !!! HARDCODED /etc/enigma2
                self.removeCurrentService()
                try:
-                       remove(filename)
+                       if filename is not None:
+                               remove(filename)
                except OSError:
                        print "error during remove of", filename