From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 9 Sep 2016 23:37:53 +0000 (-0700)
Subject: Issue #25144: Ensures TargetDir is set before continuing with custom install.
X-Git-Tag: v3.6.0b1~146^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c87ae806abdf79dd5d000aaec47596122a93b29b;p=thirdparty%2FPython%2Fcpython.git

Issue #25144: Ensures TargetDir is set before continuing with custom install.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index e05e8e73fce1..aeb38a1d77ca 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -275,6 +275,9 @@ Tools/Demos
 Windows
 -------
 
+- Issue #25144: Ensures TargetDir is set before continuing with custom
+  install.
+
 - Issue #27469: Adds a shell extension to the launcher so that drag and drop
   works correctly.
 
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index b7b2ecf39b38..6a67ee211ce7 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -327,6 +327,9 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
         case ID_CUSTOM_INSTALL_BUTTON:
             SavePageSettings();
 
+            hr = EnsureTargetDir();
+            ExitOnFailure(hr, L"Failed to set TargetDir");
+
             hr = BalGetStringVariable(L"TargetDir", &targetDir);
             if (SUCCEEDED(hr)) {
                 // TODO: Check whether directory exists and contains another installation