WIXBUG:6158 - Fix bug with m_fShowingInternalUiThisPackage

where it was calculated with the bundle action instead of the package action.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp
index 2a05b1cb..e78b37b0 100644
--- a/src/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -748,8 +748,12 @@ public: // IBootstrapperApplication
                 wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId;
             }
 
-            //Burn engine doesn't show internal UI for msi packages during uninstall or repair actions.
-            m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && BOOTSTRAPPER_ACTION_UNINSTALL != m_plannedAction && BOOTSTRAPPER_ACTION_REPAIR != m_plannedAction;
+            // Needs to match MsiEngineCalculateInstallUiLevel in msiengine.cpp in Burn.
+            m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI &&
+                                              BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action &&
+                                              BOOTSTRAPPER_ACTION_STATE_REPAIR != action &&
+                                              (BOOTSTRAPPER_DISPLAY_FULL == m_command.display ||
+                                              BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display);
 
             ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz);
             ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz);