From 1eae133ed5d907cc6318af7dba0e9c2fc01ab411 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Mon, 19 Jun 2017 19:03:18 +0100
Subject: [PATCH] Be more careful when checking pre-existing install location

---
 EDMarketConnector.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 28626418..80a7a2cf 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -46,12 +46,12 @@
 		<CustomAction Id="SetINSTALLDIR" Property="INSTALLDIR" Value="[ARPINSTALLLOCATION]" />
 		<InstallUISequence>
 			<Custom Action="SetINSTALLDIR" After="AppSearch">
-				ARPINSTALLLOCATION
+				WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION
 			</Custom>
 		</InstallUISequence>
 		<InstallExecuteSequence>
 			<Custom Action="SetINSTALLDIR" After="AppSearch">
-				ARPINSTALLLOCATION
+				WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION
 			</Custom>
 		</InstallExecuteSequence>