Merge branch 'master' of git://git.opendreambox.org/git/enigma2

2 files changed, 11 insertions, 4 deletions

diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index 0471843c..0e501237 100644
--- a/lib/python/Components/Lcd.py
+++ b/lib/python/Components/Lcd.py
@@ -44,9 +44,14 @@ def InitLcd():
 
 		ilcd = LCD()
 
-		config.lcd.bright = ConfigSlider(default=10, limits=(0, 10))
+		config.lcd.standby = ConfigSlider(default=0, limits=(0, 10))
+		config.lcd.standby.addNotifier(setLCDbright);
+		config.lcd.standby.apply = lambda : setLCDbright(config.lcd.standby)
+
+		config.lcd.bright = ConfigSlider(default=5, limits=(0, 10))
 		config.lcd.bright.addNotifier(setLCDbright);
 		config.lcd.bright.apply = lambda : setLCDbright(config.lcd.bright)
+		config.lcd.bright.callNotifiersOnSaveAndCancel = True
 
 		if not ilcd.isOled():
 			config.lcd.contrast = ConfigSlider(default=5, limits=(0, 20))
@@ -54,9 +59,6 @@ def InitLcd():
 		else:
 			config.lcd.contrast = ConfigNothing()
 
-		config.lcd.standby = ConfigSlider(default=0, limits=(0, 10))
-		config.lcd.standby.apply = lambda : setLCDbright(config.lcd.standby)
-
 		config.lcd.invert = ConfigYesNo(default=False)
 		config.lcd.invert.addNotifier(setLCDinverted);
 	else:
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index c21a9192..4ddcabec 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -34,6 +34,7 @@ class ConfigElement(object):
 		self.save_disabled = False
 		self.notifiers = []
 		self.enabled = True
+		self.callNotifiersOnSaveAndCancel = False
 
 	# you need to override this to do input validation
 	def setValue(self, value):
@@ -66,9 +67,13 @@ class ConfigElement(object):
 			self.saved_value = None
 		else:
 			self.saved_value = self.tostring(self.value)
+		if self.callNotifiersOnSaveAndCancel:
+			self.changed()
 
 	def cancel(self):
 		self.load()
+		if self.callNotifiersOnSaveAndCancel:
+			self.changed()
 
 	def isChanged(self):
 		sv = self.saved_value