changeset:   98178:94ea3e05817f
branch:      3.5
user:        Steve Dower <steve.dower@microsoft.com>
date:        Tue Sep 22 16:36:33 2015 -0700
files:       Misc/NEWS Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
description:
Issue #25081: Makes Back button in installer go back to upgrade page when upgrading.


diff -r 4e98c622ab20 -r 94ea3e05817f Misc/NEWS
--- a/Misc/NEWS	Tue Sep 22 16:36:33 2015 -0700
+++ b/Misc/NEWS	Tue Sep 22 16:36:33 2015 -0700
@@ -150,6 +150,9 @@
 Windows
 -------
 
+- Issue #25081: Makes Back button in installer go back to upgrade page when
+  upgrading.
+
 - Issue #25091: Increases font size of the installer.
 
 - Issue #25126: Clarifies that the non-web installer will download some
diff -r 4e98c622ab20 -r 94ea3e05817f Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp	Tue Sep 22 16:36:33 2015 -0700
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp	Tue Sep 22 16:36:33 2015 -0700
@@ -323,6 +323,8 @@
             SavePageSettings();
             if (_modifying) {
                 GoToPage(PAGE_MODIFY);
+            } else if (_upgrading) {
+                GoToPage(PAGE_UPGRADE);
             } else {
                 GoToPage(PAGE_INSTALL);
             }
@@ -2524,6 +2526,7 @@
                     case BOOTSTRAPPER_ACTION_INSTALL:
                         if (_upgradingOldVersion) {
                             _installPage = PAGE_UPGRADE;
+                            _upgrading = TRUE;
                         } else if (SUCCEEDED(BalGetNumericVariable(L"SimpleInstall", &simple)) && simple) {
                             _installPage = PAGE_SIMPLE_INSTALL;
                         } else {
@@ -3029,6 +3032,7 @@
         _suppressDowngradeFailure = FALSE;
         _suppressRepair = FALSE;
         _modifying = FALSE;
+        _upgrading = FALSE;
 
         _overridableVariables = nullptr;
         _taskbarList = nullptr;
@@ -3113,6 +3117,7 @@
     BOOL _suppressDowngradeFailure;
     BOOL _suppressRepair;
     BOOL _modifying;
+    BOOL _upgrading;
 
     int _crtInstalledToken;