From 50c8bbd764d2fde23e79a042e1332bb259fd18b1 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 5 Aug 2019 17:05:42 +0200
Subject: installer: raise UI on MSI relaunch and add DO_NOT_LAUNCH override

Clicking on the MSI of an already installed WireGuard launches/raises
WireGuard UI now.

WireGuard UI launching can now also be disabled by invoking:
`msiexec /i wireguard...msi DO_NOT_LAUNCH=1`

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 installer/wireguard.wxs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'installer/wireguard.wxs')

diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index c8a7d7c2..57ce388e 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -140,8 +140,15 @@
 		-->
 		<CustomAction Id="LaunchApplication" HideTarget="yes" Impersonate="no" Execute="deferred" FileKey="wireguard.exe" ExeCommand="" Return="asyncNoWait" />
 		<InstallExecuteSequence>
-			<!-- TODO: this should not launch when msiexec is called with whatever flag means it shouldn't launch. -->
-			<Custom Action="LaunchApplication" After="PublishProduct">NOT Installed</Custom>
+			<Custom Action="LaunchApplication" Before="InstallFinalize">NOT Installed AND NOT DO_NOT_LAUNCH</Custom>
+		</InstallExecuteSequence>
+
+		<!--
+			Launch wireguard.exe on product reconfiguration (starting same MSI again)
+		-->
+		<CustomAction Id="LaunchApplicationAsOrdinaryUser" HideTarget="yes" FileKey="wireguard.exe" ExeCommand="" Return="asyncNoWait" />
+		<InstallExecuteSequence>
+			<Custom Action="LaunchApplicationAsOrdinaryUser" After="InstallFinalize">Installed AND ProductState=5 AND NOT DO_NOT_LAUNCH</Custom>
 		</InstallExecuteSequence>
 	</Product>
 </Wix>
-- 
cgit v1.2.3-59-g8ed1b