diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-02 16:56:57 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-04 22:16:10 -0600 |
commit | bb7d4bdc09d0b52a65b8cf3b5ae629f385fc8011 (patch) | |
tree | 6d144200ff008c8e8f1f74a51475c54b95f04912 /src/engine/apply.cpp | |
parent | cc5fe7c79aad14819df1b4cb134884b80a945141 (diff) | |
download | wix-bb7d4bdc09d0b52a65b8cf3b5ae629f385fc8011.tar.gz wix-bb7d4bdc09d0b52a65b8cf3b5ae629f385fc8011.tar.bz2 wix-bb7d4bdc09d0b52a65b8cf3b5ae629f385fc8011.zip |
Clean up synchronization between the engine and the BA.
Diffstat (limited to 'src/engine/apply.cpp')
-rw-r--r-- | src/engine/apply.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp index dd4932aa..76831461 100644 --- a/src/engine/apply.cpp +++ b/src/engine/apply.cpp | |||
@@ -366,7 +366,7 @@ extern "C" HRESULT ApplyRegister( | |||
366 | hr = CoreSaveEngineState(pEngineState); | 366 | hr = CoreSaveEngineState(pEngineState); |
367 | if (FAILED(hr)) | 367 | if (FAILED(hr)) |
368 | { | 368 | { |
369 | LogErrorId(hr, MSG_STATE_NOT_SAVED, NULL, NULL, NULL); | 369 | LogErrorId(hr, MSG_STATE_NOT_SAVED); |
370 | hr = S_OK; | 370 | hr = S_OK; |
371 | } | 371 | } |
372 | 372 | ||
@@ -1348,8 +1348,6 @@ static HRESULT PromptForSource( | |||
1348 | HRESULT hr = S_OK; | 1348 | HRESULT hr = S_OK; |
1349 | BOOTSTRAPPER_RESOLVESOURCE_ACTION action = BOOTSTRAPPER_RESOLVESOURCE_ACTION_NONE; | 1349 | BOOTSTRAPPER_RESOLVESOURCE_ACTION action = BOOTSTRAPPER_RESOLVESOURCE_ACTION_NONE; |
1350 | 1350 | ||
1351 | UserExperienceDeactivateEngine(pUX); | ||
1352 | |||
1353 | hr = UserExperienceOnResolveSource(pUX, wzPackageOrContainerId, wzPayloadId, wzLocalSource, wzDownloadSource, &action); | 1351 | hr = UserExperienceOnResolveSource(pUX, wzPackageOrContainerId, wzPayloadId, wzLocalSource, wzDownloadSource, &action); |
1354 | if (FAILED(hr)) | 1352 | if (FAILED(hr)) |
1355 | { | 1353 | { |
@@ -1376,7 +1374,6 @@ static HRESULT PromptForSource( | |||
1376 | } | 1374 | } |
1377 | 1375 | ||
1378 | LExit: | 1376 | LExit: |
1379 | UserExperienceActivateEngine(pUX, NULL); | ||
1380 | return hr; | 1377 | return hr; |
1381 | } | 1378 | } |
1382 | 1379 | ||