From: Felix Domke Date: Thu, 23 Nov 2006 21:18:26 +0000 (+0000) Subject: don't crash when removing a marker from bouquet list X-Git-Tag: 2.6.0~2677 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/063271e1465b87f8d8aa42f16dbbeab18d12cf99?ds=sidebyside don't crash when removing a marker from bouquet list --- diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 4430edd0..c376d4fa 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -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