diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-04-29 21:16:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 21:16:17 (GMT) |
| commit | 97c0194c9f334f8c7b5366aa639e18d267057e6d (patch) | |
| tree | ee4b4cccc28fa4095f064050f1677eb7f7a3cba7 /Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | |
| parent | 8e7486f41d2a4641698ba1a34a1c3eee756a4443 (diff) | |
| download | cpython-97c0194c9f334f8c7b5366aa639e18d267057e6d.zip cpython-97c0194c9f334f8c7b5366aa639e18d267057e6d.tar.gz cpython-97c0194c9f334f8c7b5366aa639e18d267057e6d.tar.bz2 | |
gh-118347: Fix Windows installer not updating launcher (GH-118386)
(cherry picked from commit 96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2)
Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index e0e179e..7cddda9 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -464,11 +464,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { LOC_STRING *pLocString = nullptr; LPCWSTR locKey = L"#(loc.Include_launcherHelp)"; - LONGLONG detectedLauncher; + LONGLONG blockedLauncher; - if (SUCCEEDED(BalGetNumericVariable(L"DetectedLauncher", &detectedLauncher)) && detectedLauncher) { + if (SUCCEEDED(BalGetNumericVariable(L"BlockedLauncher", &blockedLauncher)) && blockedLauncher) { locKey = L"#(loc.Include_launcherRemove)"; - } else if (SUCCEEDED(BalGetNumericVariable(L"DetectedOldLauncher", &detectedLauncher)) && detectedLauncher) { + } else if (SUCCEEDED(BalGetNumericVariable(L"DetectedOldLauncher", &blockedLauncher)) && blockedLauncher) { locKey = L"#(loc.Include_launcherUpgrade)"; } @@ -2671,7 +2671,7 @@ private: /*Elevate when installing for all users*/ L"InstallAllUsers or " /*Elevate when installing the launcher for all users and it was not detected*/ - L"(Include_launcher and InstallLauncherAllUsers and not DetectedLauncher)" + L"(Include_launcher and InstallLauncherAllUsers and not BlockedLauncher)" L")", L"" }; |
