From 1c4dc6b1cd2aa3ecd05fdb22f9889ed87e61cc68 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 19 Aug 2022 13:47:50 -0500 Subject: Resume automatic updates as part of ApplyUninitialize. Fixes first half of 6870 --- src/burn/engine/engine.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/burn/engine/engine.cpp') diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index 334ea23b..2d2da1d5 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp @@ -638,7 +638,6 @@ static HRESULT RunElevated( { HRESULT hr = S_OK; HANDLE hLock = NULL; - BOOL fDisabledAutomaticUpdates = FALSE; // connect to per-user process hr = PipeChildConnect(&pEngineState->companionConnection, TRUE); @@ -666,7 +665,7 @@ static HRESULT RunElevated( SrpInitialize(TRUE); // Pump messages from parent process. - hr = ElevationChildPumpMessages(pEngineState->dwElevatedLoggingTlsId, pEngineState->companionConnection.hPipe, pEngineState->companionConnection.hCachePipe, &pEngineState->approvedExes, &pEngineState->cache, &pEngineState->containers, &pEngineState->packages, &pEngineState->payloads, &pEngineState->variables, &pEngineState->registration, &pEngineState->userExperience, &hLock, &fDisabledAutomaticUpdates, &pEngineState->userExperience.dwExitCode, &pEngineState->fRestart, &pEngineState->plan.fApplying); + hr = ElevationChildPumpMessages(pEngineState->dwElevatedLoggingTlsId, pEngineState->companionConnection.hPipe, pEngineState->companionConnection.hCachePipe, &pEngineState->approvedExes, &pEngineState->cache, &pEngineState->containers, &pEngineState->packages, &pEngineState->payloads, &pEngineState->variables, &pEngineState->registration, &pEngineState->userExperience, &hLock, &pEngineState->userExperience.dwExitCode, &pEngineState->fRestart, &pEngineState->plan.fApplying); LogRedirect(NULL, NULL); // reset logging so the next failure gets written to "log buffer" for the failure log. ExitOnFailure(hr, "Failed to pump messages from parent process."); @@ -676,11 +675,6 @@ LExit: // If the message window is still around, close it. UiCloseMessageWindow(pEngineState); - if (fDisabledAutomaticUpdates) - { - ElevationChildResumeAutomaticUpdates(); - } - if (hLock) { ::ReleaseMutex(hLock); -- cgit v1.2.3-55-g6feb