From 030ef84c2e8df6cacc40a87ef822b388987de4f2 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 3 May 2016 21:59:58 -0700
Subject: [PATCH] installer: check if ServiceRunning both on install and
 uninstall

---
 build/VStudio/installer/Product.wxs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index be268436..096dcd0e 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -202,10 +202,16 @@
             DllEntry="ServiceRunning"
             Execute="immediate"
             Return="ignore" />
+        <CustomAction
+            Id="Action.ServiceRunning.Error"
+            Error="The $(var.MyProductName) service appears to be running. If you just uninstalled $(var.MyProductName) please restart your computer. If you are running a development version of $(var.MyProductName) please remove it before proceeding." />
         <InstallExecuteSequence>
-            <Custom Action="Params.ServiceRunning" Before="Action.ServiceRunning">REMOVE ~= "ALL"</Custom>
-            <Custom Action="Action.ServiceRunning" After="RemoveFiles">REMOVE ~= "ALL"</Custom>
-            <ScheduleReboot After="Action.ServiceRunning">
+            <Custom Action="Params.ServiceRunning" Before="Action.ServiceRunning" />
+            <Custom Action="Action.ServiceRunning" Before="LaunchConditions" />
+            <Custom Action="Action.ServiceRunning.Error" After="Action.ServiceRunning">
+                <![CDATA[NOT Installed AND (0 <> ServiceRunning)]]>
+            </Custom>
+            <ScheduleReboot After="RemoveFiles">
                 <![CDATA[(REMOVE ~= "ALL") AND (0 <> ServiceRunning)]]>
             </ScheduleReboot>
         </InstallExecuteSequence>