Set more detect-phase values when falling back.

When configurable-scope bundle is already installed,
find it during detect by falling back from machine to user.
Set the scope as early as possible so detect-phase checks
(e.g., cache path, state file) work as expected.

Fixes https://github.com/wixtoolset/issues/issues/9257

1 files changed, 2 insertions, 2 deletions

diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp
index b7a54246..818427ac 100644
--- a/src/burn/engine/apply.cpp
+++ b/src/burn/engine/apply.cpp
@@ -536,8 +536,6 @@ extern "C" HRESULT ApplyUnregister(
         IgnoreRollbackError(hrRegistrationRollback, "Dependent registration actions failed");
     }
 
-    LogId(REPORT_STANDARD, MSG_SESSION_END, pEngineState->registration.sczRegistrationKey, LoggingInstallScopeToString(pEngineState->registration.fPerMachine), LoggingResumeModeToString(resumeMode), LoggingRestartToString(restart), LoggingBoolToString(pEngineState->registration.fDisableResume), LoggingRegistrationTypeToString(defaultRegistrationType), LoggingRegistrationTypeToString(registrationType));
-
     if (BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action)
     {
         registrationType = BOOTSTRAPPER_REGISTRATION_TYPE_NONE;
@@ -546,6 +544,8 @@ extern "C" HRESULT ApplyUnregister(
         LogId(REPORT_STANDARD, MSG_UNSAFE_SESSION_END);
     }
 
+    LogId(REPORT_STANDARD, MSG_SESSION_END, pEngineState->registration.sczRegistrationKey, LoggingInstallScopeToString(pEngineState->registration.fPerMachine), LoggingResumeModeToString(resumeMode), LoggingRestartToString(restart), LoggingBoolToString(pEngineState->registration.fDisableResume), LoggingRegistrationTypeToString(defaultRegistrationType), LoggingRegistrationTypeToString(registrationType));
+
     if (pEngineState->registration.fPerMachine)
     {
         hr = ElevationSessionEnd(pEngineState->companionConnection.hPipe, resumeMode, restart, pEngineState->registration.fDetectedForeignProviderKeyBundleCode, qwEstimatedSize, registrationType);