diff options
author | Steve Dower <steve.dower@python.org> | 2024-04-29 20:46:25 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-29 20:46:25 (GMT) |
commit | 96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2 (patch) | |
tree | cb7a679cab1276614b23596a4857ddcc897d3cea /Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | |
parent | 2ba1aed596ff9e7c5e193cf990f1f20f08bbf116 (diff) | |
download | cpython-96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2.zip cpython-96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2.tar.gz cpython-96d8ca7ad6c4f23f023dd6ed0abd042b29dff4a2.tar.bz2 |
gh-118347: Fix Windows installer not updating launcher (GH-118386)
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"" }; |