rework the new screen DB stuff:

[lilass.git] / question_frontend.py

diff --git a/question_frontend.py b/question_frontend.py
index fc9e8c6dd0048f7c585f500d671451843c24e26e..4244ba8d1234763f1f128ecae7bb9b9810e8f980 100644 (file)
--- a/question_frontend.py
+++ b/question_frontend.py
@@ -40,13 +40,13 @@ class QuestionFrontend:
         return self.userChoose("Select resolution for %s"%displayname, modedescs, availablemodes, None)
 
     def setup (self, situation):
-        if situation.lastSetup:
-            applyLast = self.userChoose("This display is known. The last setup for it was like this:\n%s.\nApply the last used configuration?" % str(situation.lastSetup), ("Apply last setup", "Enter different setup"), (True,False), None)
-            if applyLast is None:
+        if situation.previousSetup:
+            applyPrevious = self.userChoose("This display is known. The last setup for it was like this:\n%s.\nApply the last used configuration?" % str(situation.previousSetup), ("Apply last setup", "Enter different setup"), (True,False), None)
+            if applyPrevious is None:
                 return None
-            if applyLast is True:
-                return situation.lastSetup
-            assert applyLast is False
+            if applyPrevious is True:
+                return situation.previousSetup
+            assert applyPrevious is False
         operationmodes = list(OperationMode)
         operationmodedescs = list(map(lambda x: x.text, operationmodes))
         operationmode = self.userChoose ("Display setup", operationmodedescs, operationmodes, None)