diff options
Diffstat (limited to 'src/burn/engine')
-rw-r--r-- | src/burn/engine/apply.cpp | 2 | ||||
-rw-r--r-- | src/burn/engine/core.cpp | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp index 0467132e..dfaba3f2 100644 --- a/src/burn/engine/apply.cpp +++ b/src/burn/engine/apply.cpp | |||
@@ -387,7 +387,7 @@ extern "C" HRESULT ApplyRegister( | |||
387 | ExitOnRootFailure(hr, "BA aborted register begin."); | 387 | ExitOnRootFailure(hr, "BA aborted register begin."); |
388 | 388 | ||
389 | // If we have a resume mode that suggests the bundle is on the machine. | 389 | // If we have a resume mode that suggests the bundle is on the machine. |
390 | if (BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING < pEngineState->command.resumeType) | 390 | if (BOOTSTRAPPER_RESUME_TYPE_REBOOT <= pEngineState->command.resumeType) |
391 | { | 391 | { |
392 | // resume previous session | 392 | // resume previous session |
393 | if (pEngineState->registration.fPerMachine) | 393 | if (pEngineState->registration.fPerMachine) |
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 | ||