aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-08-17 10:58:44 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-08-17 10:58:44 +0200
commitd2c4c1ad37584e70eec158c412958ed38743b64c (patch)
tree9e4b54f23af38a0b237ae6a2b01813e42757f50a
parentinstaller: tame restart manager (diff)
downloadwireguard-windows-d2c4c1ad37584e70eec158c412958ed38743b64c.tar.xz
wireguard-windows-d2c4c1ad37584e70eec158c412958ed38743b64c.zip
installer: make the two types of post-install execution mutually exclusive
-rw-r--r--installer/wireguard.wxs4
1 files changed, 2 insertions, 2 deletions
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>