From d5cb7e0f68c4757d1f99fb9cf8acf2368340bb1d Mon Sep 17 00:00:00 2001
From: Chris Duck <gpduck@whatsupduck.net>
Date: Sat, 3 Feb 2018 16:58:22 -0600
Subject: [PATCH] Fix shortcut script when installed with UAC on

---
 assets/Product.wxs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index b88fd5da8b1..042bf30423c 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -43,9 +43,9 @@
     <!-- Default value of Checkbox of starting PowerShell after installation -->
     <Property Id="WixShellExecTarget" Value="[$(var.ProductVersionWithName)]pwsh.exe"/>
     <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
-    <CustomAction Id="SaveShortcutPath" Property="ShortcutPath" Value="[$ApplicationProgramsMenuShortcut]$(var.ProductSemanticVersionWithNameAndOptionalArchitecture).lnk" />
-    <CustomAction Id="FixShortcutWorkingDirectory" Script="vbscript" HideTarget="no" Impersonate="no">
-      shortcutPath = Session.Property("ShortcutPath")
+    <CustomAction Id="SaveShortcutPath" Property="FixShortcutWorkingDirectory" Value="[$ApplicationProgramsMenuShortcut]$(var.ProductSemanticVersionWithNameAndOptionalArchitecture).lnk" />
+    <CustomAction Id="FixShortcutWorkingDirectory" Script="vbscript" HideTarget="no" Impersonate="no" Execute="deferred" >
+      shortcutPath = Session.Property("CustomActionData")
       Set fso = CreateObject("Scripting.FileSystemObject")
       if (fso.FileExists(shortcutPath)) Then
         Set wshShell = CreateObject("WSCript.Shell")
@@ -198,8 +198,8 @@
       </Directory>
     </Directory>
     <InstallExecuteSequence>
-      <Custom Action="SaveShortcutPath" After="InstallFinalize" />
-      <Custom Action="FixShortcutWorkingDirectory" After="SaveShortcutPath">
+      <Custom Action="SaveShortcutPath" Before="FixShortcutWorkingDirectory" />
+      <Custom Action="FixShortcutWorkingDirectory" Before="InstallFinalize">
         NOT Installed OR NOT REMOVE OR UPGRADINGPRODUCTCODE
       </Custom>
     </InstallExecuteSequence>