Skip to content

Commit 4996f56

Browse files
CA-385151: Fix skipped MsiRMFilesInUse patch
The patch was skipped, and the "Launch XenCenter" button did not show anymore. This was because the custom property `XS_WixUIRMPressedOk` is defined within the patch. Signed-off-by: Danilo Del Busso <[email protected]>
1 parent 3b773c7 commit 4996f56

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

WixInstaller/wix_src.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ diff -ru wixlib/ExitDialog.wxl wixlib/ExitDialog.wxl
10071007
+ <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="200" Width="220" Height="10" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
10081008
+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT (WixUI_InstallMode="Remove") AND XS_WixUIRMPressedOk="0"</Condition>
10091009
</Control>
1010-
diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
1010+
diff -ru wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
10111011
--- wixlib/MsiRMFilesInUse.wxs
10121012
+++ wixlib/MsiRMFilesInUse.wxs
10131013
@@ -6,10 +6,13 @@
@@ -1024,4 +1024,3 @@ diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
10241024
</Control>
10251025
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
10261026
<Publish Event="EndDialog" Value="Exit">1</Publish>
1027-

0 commit comments

Comments
 (0)