diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-07-19 15:17:10 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-07-20 08:53:56 -0500 |
commit | 913b6238417dceeb8440315e4669990756d17655 (patch) | |
tree | a9e3552ea124d2025e30436afc8629f071c01ed4 /src/burn/engine/core.cpp | |
parent | 93bb820eff547f8de304f05249f572da861256fb (diff) | |
download | wix-913b6238417dceeb8440315e4669990756d17655.tar.gz wix-913b6238417dceeb8440315e4669990756d17655.tar.bz2 wix-913b6238417dceeb8440315e4669990756d17655.zip |
Add WixInternalUIBootstrapperApplication as a new built-in BA.
Implements 6835
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r-- | src/burn/engine/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 90bbc8f6..bfd979de 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
@@ -447,9 +447,6 @@ extern "C" HRESULT CorePlan( | |||
447 | BURN_PACKAGE* pForwardCompatibleBundlePackage = NULL; | 447 | BURN_PACKAGE* pForwardCompatibleBundlePackage = NULL; |
448 | BOOL fContinuePlanning = TRUE; // assume we won't skip planning due to dependencies. | 448 | BOOL fContinuePlanning = TRUE; // assume we won't skip planning due to dependencies. |
449 | 449 | ||
450 | hr = PlanSetVariables(action, &pEngineState->variables); | ||
451 | ExitOnFailure(hr, "Failed to update action."); | ||
452 | |||
453 | LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action)); | 450 | LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action)); |
454 | 451 | ||
455 | fPlanBegan = TRUE; | 452 | fPlanBegan = TRUE; |
@@ -469,6 +466,9 @@ extern "C" HRESULT CorePlan( | |||
469 | pEngineState->fPlanned = FALSE; | 466 | pEngineState->fPlanned = FALSE; |
470 | PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); | 467 | PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); |
471 | 468 | ||
469 | hr = PlanSetVariables(action, &pEngineState->variables); | ||
470 | ExitOnFailure(hr, "Failed to update action."); | ||
471 | |||
472 | // Remember the overall action state in the plan since it shapes the changes | 472 | // Remember the overall action state in the plan since it shapes the changes |
473 | // we make everywhere. | 473 | // we make everywhere. |
474 | pEngineState->plan.action = action; | 474 | pEngineState->plan.action = action; |