X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FRecordPaths.py;h=55159d94925cd265a43790914505939859bd3908;hp=22ca9fcf01037e4ad7e287be90c270b496ce2a84;hb=HEAD;hpb=be533a7e21618d31831e8c2ecc4898dfe5c4edcc diff --git a/lib/python/Screens/RecordPaths.py b/lib/python/Screens/RecordPaths.py index 22ca9fc..55159d9 100644 --- a/lib/python/Screens/RecordPaths.py +++ b/lib/python/Screens/RecordPaths.py @@ -36,16 +36,16 @@ class RecordPathsSettings(Screen,ConfigListScreen): }, -2) def checkReadWriteDir(self, configele): + value = configele.value print "checkReadWrite: ", configele.value - if configele.value in [x[0] for x in self.styles] or fileExists(configele.value, "w"): - configele.last_value = configele.value + if not value or value in [x[0] for x in self.styles] or fileExists(value, "w"): + configele.last_value = value return True else: - dir = configele.value configele.value = configele.last_value self.session.open( MessageBox, - _("The directory %s is not writable.\nMake sure you select a writable directory instead.")%dir, + _("The directory %s is not writable.\nMake sure you select a writable directory instead.") % value, type = MessageBox.TYPE_ERROR ) return False @@ -55,11 +55,11 @@ class RecordPathsSettings(Screen,ConfigListScreen): styles_keys = [x[0] for x in self.styles] tmp = config.movielist.videodirs.value default = config.usage.default_path.value - if default not in tmp: + if default and default not in tmp: tmp = tmp[:] tmp.append(default) print "DefaultPath: ", default, tmp - self.default_dirname = ConfigSelection(default = default, choices = tmp) + self.default_dirname = ConfigSelection(default = default, choices = [("", _(""))] + tmp) tmp = config.movielist.videodirs.value default = config.usage.timer_path.value if default not in tmp and default not in styles_keys: @@ -148,10 +148,10 @@ class RecordPathsSettings(Screen,ConfigListScreen): styles_keys = [x[0] for x in self.styles] tmp = config.movielist.videodirs.value default = self.default_dirname.value - if default not in tmp: + if default and default not in tmp: tmp = tmp[:] tmp.append(default) - self.default_dirname.setChoices(tmp, default=default) + self.default_dirname.setChoices([("", _(""))] + tmp, default=default) tmp = config.movielist.videodirs.value default = self.timer_dirname.value if default not in tmp and default not in styles_keys: