From bd0f3491f36f4e24dd899e0c3479beed6e3c00f9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 12 Dec 2022 23:09:03 -0600 Subject: wixstdba should not change the action if not showing full UI. wixstdba should not block downgrading if run from an upgrade related bundle. Fixes 7081 --- src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ext') diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index 3539450e..998fe4cf 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp @@ -271,8 +271,9 @@ public: // IBootstrapperApplication } } } - else // maybe modify the action state if the bundle is or is not already installed. + else if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display) // only modify the action state if showing full UI. { + // Maybe modify the action state if the bundle is or is not already installed. if (fInstalled && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && BOOTSTRAPPER_ACTION_INSTALL == m_command.action) { m_command.action = BOOTSTRAPPER_ACTION_MODIFY; @@ -329,7 +330,7 @@ public: // IBootstrapperApplication // Best effort } - if (BOOTSTRAPPER_ACTION_INSTALL == m_command.action && BOOTSTRAPPER_RELATION_UPGRADE == relationType) + if (BOOTSTRAPPER_ACTION_INSTALL == m_command.action && BOOTSTRAPPER_RELATION_UPGRADE != m_command.relationType && BOOTSTRAPPER_RELATION_UPGRADE == relationType) { int nResult = 0; HRESULT hr = VerCompareStringVersions(m_sczBundleVersion, wzVersion, TRUE/*fStrict*/, &nResult); -- cgit v1.2.3-55-g6feb