diff options
-rw-r--r-- | src/wixstdba/WixStandardBootstrapperApplication.cpp | 8 |
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 | |||
748 | wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; | 748 | wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; |
749 | } | 749 | } |
750 | 750 | ||
751 | //Burn engine doesn't show internal UI for msi packages during uninstall or repair actions. | 751 | // Needs to match MsiEngineCalculateInstallUiLevel in msiengine.cpp in Burn. |
752 | m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && BOOTSTRAPPER_ACTION_UNINSTALL != m_plannedAction && BOOTSTRAPPER_ACTION_REPAIR != m_plannedAction; | 752 | m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && |
753 | BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action && | ||
754 | BOOTSTRAPPER_ACTION_STATE_REPAIR != action && | ||
755 | (BOOTSTRAPPER_DISPLAY_FULL == m_command.display || | ||
756 | BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display); | ||
753 | 757 | ||
754 | ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); | 758 | ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); |
755 | ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); | 759 | ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); |