From da0e9900a7a63ab35a163871bed3c3e1be6029c7 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 30 Nov 2022 22:15:09 +0200
Subject: [PATCH] Removed LaunchApplication CustomAction duplication RIVM-6

---
 contrib/msi/build-msi-gui.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/contrib/msi/build-msi-gui.sh b/contrib/msi/build-msi-gui.sh
index ab5c70cc..2aa3a1df 100644
--- a/contrib/msi/build-msi-gui.sh
+++ b/contrib/msi/build-msi-gui.sh
@@ -297,12 +297,6 @@ cat > wix.xml << EOF
       Impersonate="yes" />
 
     <!-- Step 2: Add UI to your installer / Step 4: Trigger the custom action -->
-    <CustomAction Id="LaunchApplication"
-      FileKey="MeshUI"
-      ExeCommand="[MeshInstallFolder]mesh-ui.exe ui\index.html"
-      Execute="immediate"
-      Impersonate="yes"
-      Return="asyncNoWait" />
     <UI>
         <UIRef Id="WixUI_Minimal" />
         <Publish Dialog="ExitDialog"
@@ -310,17 +304,19 @@ cat > wix.xml << EOF
             Event="DoAction"
             Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
     </UI>
+    <CustomAction Id="LaunchApplication"
+        ExeCommand="[MeshInstallFolder]mesh-ui.exe ui\index.html"
+        Execute="immediate"
+        BinaryKey="WixCA"
+        DllEntry="WixShellExec"
+        Impersonate="yes"
+        Return="asyncNoWait"/>
     <WixVariable Id="WixUILicenseRtf" Value="${PKGLICENSEFILE}" />
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch RiV-mesh" />
 
     <!-- Step 3: Include the custom action -->
     <Property Id="WixShellExecTarget" Value="[#MeshUI]" />
     <Property Id="ASSISTANCE_START_VIA_REGISTRY">1</Property>
-    <CustomAction Id="LaunchApplication"
-        BinaryKey="WixCA"
-        DllEntry="WixShellExec"
-        Impersonate="yes" />
-
     <InstallExecuteSequence>
       <Custom
         Action="UpdateGenerateConfig"