8000 Issue #25081: Makes Back button in installer go back to upgrade page … · python/cpython@44fe401 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 44fe401

Browse files
committed
Issue #25081: Makes Back button in installer go back to upgrade page when upgrading.
1 parent 14b9e6c commit 44fe401

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Misc/NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ Build
150150
Windows
151151
-------
152152

153+
- Issue #25081: Makes Back button in installer go back to upgrade page when
154+
upgrading.
155+
153156
- Issue #25091: Increases font size of the installer.
154157

155158
- Issue #25126: Clarifies that the non-web installer will download some

Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
323323
SavePageSettings();
324324
if (_modifying) {
325325
GoToPage(PAGE_MODIFY);
326+
} else if (_upgrading) {
327+
GoToPage(PAGE_UPGRADE);
326328
} else {
327329
GoToPage(PAGE_INSTALL);
328330
}
@@ -2524,6 +2526,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
25242526
case BOOTSTRAPPER_ACTION_INSTALL:
25252527
if (_upgradingOldVersion) {
25262528
_installPage = PAGE_UPGRADE;
2529+
_upgrading = TRUE;
25272530
} else if (SUCCEEDED(BalGetNumericVariable(L"SimpleInstall", &simple)) && simple) {
25282531
_installPage = PAGE_SIMPLE_INSTALL;
25292532
} else {
@@ -3029,6 +3032,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
30293032
_suppressDowngradeFailure = FALSE;
30303033
_suppressRepair = FALSE;
30313034
_modifying = FALSE;
3035+
_upgrading = FALSE;
30323036

30333037
_overridableVariables = nullptr;
30343038
_taskbarList = nullptr;
@@ -3113,6 +3117,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
31133117
BOOL _suppressDowngradeFailure;
31143118
BOOL _suppressRepair;
31153119
BOOL _modifying;
3120+
BOOL _upgrading;
31163121

31173122
int _crtInstalledToken;
31183123

0 commit comments

Comments
 (0)
0