fix for inconsistency when moving the selection while callback is not called

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 724db4d6..c433f01b 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -291,7 +291,8 @@ class configText:
 		self.parent.save()
 		
 	def nextEntry(self):
-		self.parent.vals[1]()
+		print self.parent
+		self.parent.vals[1](self.parent.getConfigPath())
 
 	def handleKey(self, key):
 		#this will no change anything on the value itself
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 0c94c170..d8f44c91 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -40,7 +40,7 @@ class TimerEntry(Screen):
             config.timerentry = ConfigSubsection()
 
             config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, 0, ("once", "repeated"))
-            config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRight))
+            config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback))
 
             config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, 0, ("daily", "weekly", "Mon-Fri", "user-defined"))
 
@@ -129,6 +129,12 @@ class TimerEntry(Screen):
         self["config"].handleKey(config.key["prevElement"])
         self.newConfig()
 
+    def keyRightCallback(self, configPath):
+        currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath()
+        # check if we are still on the same config entry
+        if (currentConfigPath == configPath):
+            self.keyRight()
+
     def keyRight(self):
         self["config"].handleKey(config.key["nextElement"])
         self.newConfig()