mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix installer Back button going to wrong page when modifying.

Browse source 
Also fix error when doing test builds without documentation file.
This commit is contained in:
Steve Dower 2015-02-11 17:49:01 -08:00
parent 8b62bbf2e5
commit db80aec67a
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file

@ -325,7 +325,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
case ID_CUSTOM1_BACK_BUTTON: case ID_CUSTOM1_BACK_BUTTON:
SavePageSettings(); SavePageSettings();
GoToPage(PAGE_INSTALL); if (_modifying) {
GoToPage(PAGE_MODIFY);
} else {
GoToPage(PAGE_INSTALL);
}
break; break;
case ID_INSTALL_CUSTOM_BUTTON: __fallthrough; case ID_INSTALL_CUSTOM_BUTTON: __fallthrough;
@ -412,6 +416,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
_engine->SetVariableString(L"InstallAllUsersState", L"disable"); _engine->SetVariableString(L"InstallAllUsersState", L"disable");
_engine->SetVariableString(L"TargetDirState", L"disable"); _engine->SetVariableString(L"TargetDirState", L"disable");
_engine->SetVariableString(L"CustomBrowseButtonState", L"disable"); _engine->SetVariableString(L"CustomBrowseButtonState", L"disable");
_modifying = TRUE;
GoToPage(PAGE_CUSTOM1); GoToPage(PAGE_CUSTOM1);
break; break;
@ -2518,6 +2523,7 @@ public:
_suppressDowngradeFailure = FALSE; _suppressDowngradeFailure = FALSE;
_suppressRepair = FALSE; _suppressRepair = FALSE;
_modifying = FALSE;
_overridableVariables = nullptr; _overridableVariables = nullptr;
_taskbarList = nullptr; _taskbarList = nullptr;
@ -2598,6 +2604,7 @@ private:
BOOL _suppressDowngradeFailure; BOOL _suppressDowngradeFailure;
BOOL _suppressRepair; BOOL _suppressRepair;
BOOL _modifying;
STRINGDICT_HANDLE _overridableVariables; STRINGDICT_HANDLE _overridableVariables;

2
Tools/msi/doc/doc.wxs
View file

@ -10,6 +10,7 @@
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="doc" /> <ComponentGroupRef Id="doc" />
<?ifdef DocFilename ?>
<Component Id="doc_shortcut" Directory="MenuDir" Guid="*"> <Component Id="doc_shortcut" Directory="MenuDir" Guid="*">
<RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> <RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
<RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#python.chm]" KeyPath="yes" /> <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#python.chm]" KeyPath="yes" />
@ -20,6 +21,7 @@
Description="!(loc.ShortcutDescription)" /> Description="!(loc.ShortcutDescription)" />
<RemoveFolder Id="Remove_MenuDir" On="uninstall" /> <RemoveFolder Id="Remove_MenuDir" On="uninstall" />
</Component> </Component>
<?endif ?>
</Feature> </Feature>
</Product> </Product>