diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-09-22 23:36:33 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-09-22 23:36:33 (GMT) |
| commit | 44fe401aa3afbb1173c1ca5aff18fc6c2efe8238 (patch) | |
| tree | 779fd21ff4a5c63eb30d8dc9f6b6e6694127d89a | |
| parent | 14b9e6c6a7a5890a11c87247ba01867fbd7b8d49 (diff) | |
| download | cpython-44fe401aa3afbb1173c1ca5aff18fc6c2efe8238.zip cpython-44fe401aa3afbb1173c1ca5aff18fc6c2efe8238.tar.gz cpython-44fe401aa3afbb1173c1ca5aff18fc6c2efe8238.tar.bz2 | |
Issue #25081: Makes Back button in installer go back to upgrade page when upgrading.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 5 |
2 files changed, 8 insertions, 0 deletions
@@ -150,6 +150,9 @@ Build 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 --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 35ed2fe..99884e4 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -323,6 +323,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { SavePageSettings(); if (_modifying) { GoToPage(PAGE_MODIFY); + } else if (_upgrading) { + GoToPage(PAGE_UPGRADE); } else { GoToPage(PAGE_INSTALL); } @@ -2524,6 +2526,7 @@ private: 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 @@ public: _suppressDowngradeFailure = FALSE; _suppressRepair = FALSE; _modifying = FALSE; + _upgrading = FALSE; _overridableVariables = nullptr; _taskbarList = nullptr; @@ -3113,6 +3117,7 @@ private: BOOL _suppressDowngradeFailure; BOOL _suppressRepair; BOOL _modifying; + BOOL _upgrading; int _crtInstalledToken; |