X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2Fconfig.py;h=d7506e31a275a0fb9a03a62b7cfabdd12b840df4;hp=1afd398ea1b6d5ed42202097f15a9806c87dbc8e;hb=3cc01c8deb6aa80db50ba6c4bc6f79e0a7a9bbd9;hpb=e88b76f7f7e0a111a2bba1573e23378a3eb88917

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 1afd398..d7506e3 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -29,6 +29,7 @@ from time import localtime, strftime
 class ConfigElement(object):
 	def __init__(self):
 		self.saved_value = None
+		self.save_forced = False
 		self.last_value = None
 		self.save_disabled = False
 		self.__notifiers = None
@@ -83,7 +84,7 @@ class ConfigElement(object):
 
 	# you need to override this if str(self.value) doesn't work
 	def save(self):
-		if self.save_disabled or self.value == self.default:
+		if self.save_disabled or (self.value == self.default and not self.save_forced):
 			self.saved_value = None
 		else:
 			self.saved_value = self.tostring(self.value)
@@ -178,7 +179,7 @@ class choicesList(object): # XXX: we might want a better name for this
 
 	def __list__(self):
 		if self.type == choicesList.LIST_TYPE_LIST:
-			ret = [not isinstance(x, tuple) and x or len(x) > 0 and x[0] or len(x) == 0 and x for x in self.choices]
+			ret = [not isinstance(x, tuple) and x or x[0] for x in self.choices]
 		else:
 			ret = self.choices.keys()
 		return ret or [""]