diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-02-12 01:49:01 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-02-12 01:49:01 (GMT) |
| commit | db80aec67a90b80992afea660ab9de4383017cde (patch) | |
| tree | 18cc08abddf34b182aca55f720676975067f295c | |
| parent | 8b62bbf2e5bbaa392a79eb69c558b41dfe68e745 (diff) | |
| download | cpython-db80aec67a90b80992afea660ab9de4383017cde.zip cpython-db80aec67a90b80992afea660ab9de4383017cde.tar.gz cpython-db80aec67a90b80992afea660ab9de4383017cde.tar.bz2 | |
Fix installer Back button going to wrong page when modifying.
Also fix error when doing test builds without documentation file.
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 9 | ||||
| -rw-r--r-- | Tools/msi/doc/doc.wxs | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index ebe4da3..5eda3f7 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -325,7 +325,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { case ID_CUSTOM1_BACK_BUTTON: SavePageSettings(); - GoToPage(PAGE_INSTALL); + if (_modifying) { + GoToPage(PAGE_MODIFY); + } else { + GoToPage(PAGE_INSTALL); + } break; case ID_INSTALL_CUSTOM_BUTTON: __fallthrough; @@ -412,6 +416,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { _engine->SetVariableString(L"InstallAllUsersState", L"disable"); _engine->SetVariableString(L"TargetDirState", L"disable"); _engine->SetVariableString(L"CustomBrowseButtonState", L"disable"); + _modifying = TRUE; GoToPage(PAGE_CUSTOM1); break; @@ -2518,6 +2523,7 @@ public: _suppressDowngradeFailure = FALSE; _suppressRepair = FALSE; + _modifying = FALSE; _overridableVariables = nullptr; _taskbarList = nullptr; @@ -2598,6 +2604,7 @@ private: BOOL _suppressDowngradeFailure; BOOL _suppressRepair; + BOOL _modifying; STRINGDICT_HANDLE _overridableVariables; diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs index 6becaf6..ddab83b 100644 --- a/Tools/msi/doc/doc.wxs +++ b/Tools/msi/doc/doc.wxs @@ -10,6 +10,7 @@ <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> <ComponentGroupRef Id="doc" /> + <?ifdef DocFilename ?> <Component Id="doc_shortcut" Directory="MenuDir" Guid="*"> <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#python.chm]" KeyPath="yes" /> @@ -20,6 +21,7 @@ Description="!(loc.ShortcutDescription)" /> <RemoveFolder Id="Remove_MenuDir" On="uninstall" /> </Component> + <?endif ?> </Feature> </Product> |