X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7581b23a6bc4823981e973c2cfcc33fbed171122..d17eccddcb6e6a6e4a5c259514355e791933139d:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 0886ddf1..9693a0b7 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,7 +1,6 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config				#global config instance
-from Components.config import configEntry
 from Components.config import configBoolean
 from Components.ConfigList import ConfigList
 from Components.Label import Label
@@ -60,9 +59,15 @@ class Setup(Screen):
 
 	def keySave(self):
 		print "save requested"
-		for x in self["config"]:
-			selection =	self["config"].getCurrent()
-			selection.save()
+		for x in self["config"].list:
+			x[1].save()
+		self.close()
+
+	def keyCancel(self):
+		print "cancel requested"
+		for x in self["config"].list:
+			x[1].cancel()
+		self.close()
 
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
@@ -93,7 +98,7 @@ class Setup(Screen):
 
 		self["actions"] = ActionMap(["SetupActions"], 
 			{
-				"cancel": self.close,
+				"cancel": self.keyCancel,
 				"ok": self.keyOk,
 				"left": self.keyLeft,
 				"right": self.keyRight,