From db80aec67a90b80992afea660ab9de4383017cde Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 11 Feb 2015 17:49:01 -0800
Subject: [PATCH] Fix installer Back button going to wrong page when modifying.
 Also fix error when doing test builds without documentation file.

---
 .../bundle/bootstrap/PythonBootstrapperApplication.cpp   | 9 ++++++++-
 Tools/msi/doc/doc.wxs                                    | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index ebe4da32e9..5eda3f75ca 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 6becaf6cd1..ddab83b5ea 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>
-- 
2.40.0