aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-11-23 21:18:26 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-11-23 21:18:26 +0000
commit063271e1465b87f8d8aa42f16dbbeab18d12cf99 (patch)
tree19e636168bdcc6666c0be61c3a24ed45e278f604 /lib/python/Screens
parentbaf703d44c2fdb3bb754ca8dca2ff1e2c619a2bc (diff)
downloadenigma2-063271e1465b87f8d8aa42f16dbbeab18d12cf99.tar.gz
enigma2-063271e1465b87f8d8aa42f16dbbeab18d12cf99.zip
don't crash when removing a marker from bouquet list
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/ChannelSelection.py4
1 files changed, 3 insertions, 1 deletions
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