aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/core.cpp
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-12-27 14:29:31 -0500
committerBob Arnson <github@bobs.org>2021-12-27 17:08:48 -0500
commit9d75d94dfbda512bd3d26aec0d9d100101272a63 (patch)
treef903322a534d659c8bc93a19301b6c306d7358c0 /src/burn/engine/core.cpp
parent4c34ad46d0eb664a48dc2b4a7696cd96c3c3a56a (diff)
downloadwix-9d75d94dfbda512bd3d26aec0d9d100101272a63.tar.gz
wix-9d75d94dfbda512bd3d26aec0d9d100101272a63.tar.bz2
wix-9d75d94dfbda512bd3d26aec0d9d100101272a63.zip
Remove BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING.
Thanks to @rseanhall's sharp eyes.
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r--src/burn/engine/core.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 812c7261..96845655 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -676,16 +676,6 @@ extern "C" HRESULT CoreApply(
676 676
677 pEngineState->plan.fAffectedMachineState = pEngineState->plan.fCanAffectMachineState; 677 pEngineState->plan.fAffectedMachineState = pEngineState->plan.fCanAffectMachineState;
678 678
679 // Abort if could affect machine state and this bundle already requires a restart.
680 if (pEngineState->plan.fCanAffectMachineState && BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING == pEngineState->command.resumeType)
681 {
682 restart = BOOTSTRAPPER_APPLY_RESTART_REQUIRED;
683
684 hr = HRESULT_FROM_WIN32(ERROR_FAIL_NOACTION_REBOOT);
685 UserExperienceSendError(&pEngineState->userExperience, BOOTSTRAPPER_ERROR_TYPE_APPLY, NULL, hr, NULL, MB_ICONERROR | MB_OK, IDNOACTION); // ignore return value.
686 ExitFunction();
687 }
688
689 hr = ApplyLock(FALSE, &hLock); 679 hr = ApplyLock(FALSE, &hLock);
690 ExitOnFailure(hr, "Another per-user setup is already executing."); 680 ExitOnFailure(hr, "Another per-user setup is already executing.");
691 681