Assume critical shutdown was caused by the current package.

Packages should not be retried if a restart was initiated.
Only the first package that initiated restart should be stored in BURN_BUNDLE_FORCED_RESTART_PACKAGE.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/burn/engine/uithread.cpp b/src/burn/engine/uithread.cpp
index 187f3349..bb1e5972 100644
--- a/src/burn/engine/uithread.cpp
+++ b/src/burn/engine/uithread.cpp
@@ -18,6 +18,7 @@ struct UITHREAD_INFO
 {
     BOOL fElevatedEngine;
     BURN_USER_EXPERIENCE* pUserExperience;
+    BOOL* pfCriticalShutdownInitiated;
 };
 
 
@@ -132,6 +133,7 @@ static DWORD WINAPI ThreadProc(
 
     info.fElevatedEngine = fElevatedEngine;
     info.pUserExperience = &pEngineState->userExperience;
+    info.pfCriticalShutdownInitiated = &pEngineState->fCriticalShutdownInitiated;
 
     // Create the window to handle reboots without activating it.
     hWnd = ::CreateWindowExW(WS_EX_NOACTIVATE, wc.lpszClassName, NULL, WS_POPUP, 0, 0, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, &info);
@@ -208,6 +210,8 @@ static LRESULT CALLBACK WndProc(
             UserExperienceOnSystemShutdown(pInfo->pUserExperience, dwEndSession, &fCancel);
         }
 
+        *pInfo->pfCriticalShutdownInitiated |= fCritical;
+
         fRet = !fCancel;
         LogId(REPORT_STANDARD, MSG_SYSTEM_SHUTDOWN, LoggingBoolToString(fCritical), LoggingBoolToString(pInfo->fElevatedEngine), LoggingBoolToString(fRet));
         return fRet;