diff options
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r-- | src/burn/engine/core.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 3fe9b586..b20f7f0c 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
@@ -586,11 +586,8 @@ extern "C" HRESULT CoreElevate( | |||
586 | while (INVALID_HANDLE_VALUE == pEngineState->companionConnection.hPipe) | 586 | while (INVALID_HANDLE_VALUE == pEngineState->companionConnection.hPipe) |
587 | { | 587 | { |
588 | // If the elevated companion pipe isn't created yet, let's make that happen. | 588 | // If the elevated companion pipe isn't created yet, let's make that happen. |
589 | if (!pEngineState->sczBundleEngineWorkingPath) | 589 | hr = CacheBundleToWorkingDirectory(pEngineState->internalCommand.fInitiallyElevated, &pEngineState->cache, pEngineState->registration.sczExecutableName, &pEngineState->section); |
590 | { | 590 | ExitOnFailure(hr, "Failed to cache engine to working directory."); |
591 | hr = CacheBundleToWorkingDirectory(pEngineState->internalCommand.fInitiallyElevated, &pEngineState->cache, pEngineState->registration.sczExecutableName, &pEngineState->section, &pEngineState->sczBundleEngineWorkingPath); | ||
592 | ExitOnFailure(hr, "Failed to cache engine to working directory."); | ||
593 | } | ||
594 | 591 | ||
595 | hr = ElevationElevate(pEngineState, reason, hwndParent); | 592 | hr = ElevationElevate(pEngineState, reason, hwndParent); |
596 | if (E_SUSPECTED_AV_INTERFERENCE == hr && 1 > cAVRetryAttempts) | 593 | if (E_SUSPECTED_AV_INTERFERENCE == hr && 1 > cAVRetryAttempts) |
@@ -695,11 +692,8 @@ extern "C" HRESULT CoreApply( | |||
695 | ::InitializeCriticalSection(&applyContext.csApply); | 692 | ::InitializeCriticalSection(&applyContext.csApply); |
696 | 693 | ||
697 | // Ensure the engine is cached to the working path. | 694 | // Ensure the engine is cached to the working path. |
698 | if (!pEngineState->sczBundleEngineWorkingPath) | 695 | hr = CacheBundleToWorkingDirectory(pEngineState->internalCommand.fInitiallyElevated, &pEngineState->cache, pEngineState->registration.sczExecutableName, &pEngineState->section); |
699 | { | 696 | ExitOnFailure(hr, "Failed to cache engine to working directory."); |
700 | hr = CacheBundleToWorkingDirectory(pEngineState->internalCommand.fInitiallyElevated, &pEngineState->cache, pEngineState->registration.sczExecutableName, &pEngineState->section, &pEngineState->sczBundleEngineWorkingPath); | ||
701 | ExitOnFailure(hr, "Failed to cache engine to working directory."); | ||
702 | } | ||
703 | 697 | ||
704 | // Elevate. | 698 | // Elevate. |
705 | if (pEngineState->plan.fPerMachine) | 699 | if (pEngineState->plan.fPerMachine) |