X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/feba724e9e6b6f6a389530e3bb67132c0b56da1c..bce291362914ca2b1101ec3503ccc89c001e7bcb:/lib/python/Screens/Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 206a87ce..c4fcb10a 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -188,6 +188,8 @@ class Wizard(Screen, HelpableScreen):
 		
 		self.lcdCallbacks = []
 		
+		self.disableKeys = False
+		
 		self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions"],
 		{
 			"ok": self.ok,
@@ -232,6 +234,8 @@ class Wizard(Screen, HelpableScreen):
 		self.lcdCallbacks.append(callback)
 
 	def back(self):
+		if self.disableKeys:
+			return
 		print "getting back..."
 		print "stepHistory:", self.stepHistory
 		if len(self.stepHistory) > 1:
@@ -291,6 +295,8 @@ class Wizard(Screen, HelpableScreen):
 
 	def ok(self):
 		print "OK"
+		if self.disableKeys:
+			return
 		currStep = self.currStep
 		
 		if self.showConfig:
@@ -382,6 +388,13 @@ class Wizard(Screen, HelpableScreen):
 		
 	def updateValues(self):
 		print "Updating values in step " + str(self.currStep)
+		# calling a step which doesn't exist can only happen if the condition in the last step is not fulfilled
+		# if a non-existing step is called, end the wizard 
+		if self.currStep > len(self.wizard):
+			self.markDone()
+			self.close()
+			return
+
 		self.timeoutTimer.stop()
 		
 		if self.configInstance is not None: