diff options
Diffstat (limited to 'src/ext/Bal/mbahost/mbahost.cpp')
-rw-r--r-- | src/ext/Bal/mbahost/mbahost.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ext/Bal/mbahost/mbahost.cpp b/src/ext/Bal/mbahost/mbahost.cpp index 0b89fc58..5edbe376 100644 --- a/src/ext/Bal/mbahost/mbahost.cpp +++ b/src/ext/Bal/mbahost/mbahost.cpp | |||
@@ -144,17 +144,17 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( | |||
144 | if (E_MBAHOST_NET452_ON_WIN7RTM == hr) | 144 | if (E_MBAHOST_NET452_ON_WIN7RTM == hr) |
145 | { | 145 | { |
146 | BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); | 146 | BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); |
147 | vstate.prereqData.hrHostInitialization = hr; | 147 | vstate.prereqData.hrFatalError = hr; |
148 | } | 148 | } |
149 | else if (vstate.prereqData.fCompleted) | 149 | else if (vstate.prereqData.fCompleted) |
150 | { | 150 | { |
151 | hr = E_PREREQBA_INFINITE_LOOP; | 151 | hr = E_PREREQBA_INFINITE_LOOP; |
152 | BalLogError(hr, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop."); | 152 | BalLogError(hr, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop."); |
153 | vstate.prereqData.hrHostInitialization = hr; | 153 | vstate.prereqData.hrFatalError = hr; |
154 | } | 154 | } |
155 | else | 155 | else |
156 | { | 156 | { |
157 | vstate.prereqData.hrHostInitialization = S_OK; | 157 | vstate.prereqData.hrFatalError = S_OK; |
158 | } | 158 | } |
159 | 159 | ||
160 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); | 160 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); |
@@ -306,6 +306,8 @@ static HRESULT LoadMbaConfiguration( | |||
306 | BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get AlwaysInstallPrereqs value."); | 306 | BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get AlwaysInstallPrereqs value."); |
307 | } | 307 | } |
308 | 308 | ||
309 | pState->prereqData.fPerformHelp = !pState->prereqData.fAlwaysInstallPrereqs; | ||
310 | |||
309 | LExit: | 311 | LExit: |
310 | ReleaseObject(pixnHost); | 312 | ReleaseObject(pixnHost); |
311 | ReleaseObject(pixdManifest); | 313 | ReleaseObject(pixdManifest); |