From 042c78544c49c2fdd0041afcc681dc634d9cc24d Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 17 Aug 2019 10:58:44 +0200
Subject: installer: make the two types of post-install execution mutually
 exclusive

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 installer/wireguard.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'installer/wireguard.wxs')

diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index 23d02a2d..5bbb1ebb 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -135,7 +135,7 @@
 		-->
 		<CustomAction Id="LaunchApplication" HideTarget="yes" Impersonate="no" Execute="deferred" FileKey="wireguard.exe" ExeCommand="" Return="asyncNoWait" />
 		<InstallExecuteSequence>
-			<Custom Action="LaunchApplication" Before="InstallFinalize">NOT Installed AND NOT DO_NOT_LAUNCH</Custom>
+			<Custom Action="LaunchApplication" Before="InstallFinalize">(&amp;WireGuardFeature = 3) AND NOT DO_NOT_LAUNCH</Custom>
 		</InstallExecuteSequence>
 
 		<!--
@@ -143,7 +143,7 @@
 		-->
 		<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>
+			<Custom Action="LaunchApplicationAsOrdinaryUser" After="InstallFinalize">(&amp;WireGuardFeature = -1) AND (!WireGuardFeature = 3) AND NOT DO_NOT_LAUNCH</Custom>
 		</InstallExecuteSequence>
 	</Product>
 </Wix>
-- 
cgit v1.2.3-59-g8ed1b