1 |
slords |
1.1 |
From 21d3be0fcedb2f56addc2e54a8d95b56c1d6dbc1 Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Shad L. Lords <slords@mail.com> |
3 |
|
|
Date: Mon, 26 Oct 2009 17:10:41 -0600 |
4 |
|
|
Subject: [PATCH] Fix goto previous if unable to go back |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
dispatch.py | 3 ++- |
8 |
|
|
text.py | 3 ++- |
9 |
|
|
2 files changed, 4 insertions(+), 2 deletions(-) |
10 |
|
|
|
11 |
|
|
diff --git a/dispatch.py b/dispatch.py |
12 |
|
|
index 5643707..c7f1990 100644 |
13 |
|
|
--- a/dispatch.py |
14 |
|
|
+++ b/dispatch.py |
15 |
|
|
@@ -175,7 +175,8 @@ class Dispatcher: |
16 |
|
|
# we can not go backwards from this screen |
17 |
|
|
i = self.step - 1 |
18 |
|
|
while i >= self.firstStep: |
19 |
|
|
- if not self.skipSteps.has_key(installSteps[i][0]): |
20 |
|
|
+ if (not self.skipSteps.has_key(installSteps[i][0]) |
21 |
|
|
+ and (type(installSteps[i][1]) != FunctionType)): |
22 |
|
|
return 1 |
23 |
|
|
i = i - 1 |
24 |
|
|
return 0 |
25 |
|
|
diff --git a/text.py b/text.py |
26 |
|
|
index 8a24be5..ffb2751 100644 |
27 |
|
|
--- a/text.py |
28 |
|
|
+++ b/text.py |
29 |
|
|
@@ -506,7 +506,8 @@ class InstallInterface: |
30 |
|
|
"from here. You will have to try " |
31 |
|
|
"again."), |
32 |
|
|
buttons=[_("OK")]) |
33 |
|
|
- dispatch.gotoPrev() |
34 |
|
|
+ else: |
35 |
|
|
+ dispatch.gotoPrev() |
36 |
|
|
else: |
37 |
|
|
dispatch.gotoNext() |
38 |
|
|
|
39 |
|
|
-- |
40 |
|
|
1.5.5.6 |
41 |
|
|
|