diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-06-16 12:37:31 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-06-17 12:01:02 -0600 |
| commit | df80238531f76724d2d3e9f4a92b0fd691cf8526 (patch) | |
| tree | aa2a5134892b186437014ed1f6bc65d477e0e6b4 | |
| parent | 43cc8d743cbae0c21c694621069c916109bdfbc7 (diff) | |
| download | wix-df80238531f76724d2d3e9f4a92b0fd691cf8526.tar.gz wix-df80238531f76724d2d3e9f4a92b0fd691cf8526.tar.bz2 wix-df80238531f76724d2d3e9f4a92b0fd691cf8526.zip | |
Apply shouldn't abort if restart's required when doing special actions.
Fixes #5394
| -rw-r--r-- | src/burn/engine/core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index e7e8e48d..ca613dc5 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -638,8 +638,8 @@ extern "C" HRESULT CoreApply( | |||
| 638 | 638 | ||
| 639 | pEngineState->plan.fAffectedMachineState = pEngineState->plan.fCanAffectMachineState; | 639 | pEngineState->plan.fAffectedMachineState = pEngineState->plan.fCanAffectMachineState; |
| 640 | 640 | ||
| 641 | // Abort if this bundle already requires a restart. | 641 | // Abort if could affect machine state and this bundle already requires a restart. |
| 642 | if (BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING == pEngineState->command.resumeType) | 642 | if (pEngineState->plan.fCanAffectMachineState && BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING == pEngineState->command.resumeType) |
| 643 | { | 643 | { |
| 644 | restart = BOOTSTRAPPER_APPLY_RESTART_REQUIRED; | 644 | restart = BOOTSTRAPPER_APPLY_RESTART_REQUIRED; |
| 645 | 645 | ||