From 37ed577a6b8de8a43fb67f30e7a0c7460a4c04a9 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 24 Apr 2020 20:24:40 +0200
Subject: [bug] stop/remove new, renamed service

---
 Makefile                                | 1 -
 branding/templates/windows/template.nsi | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ec642b2..709bdb1 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,6 @@ dependsCygwin:
 	@choco install -y golang python nssm nsis wget 7zip
 
 build:
-	echo "XBUILD>", ${XBUILD}
 ifeq (${XBUILD}, yes)
 	$(MAKE) build_cross_win
 	$(MAKE) build_cross_osx
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index 9c319d0..e3b2379 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -63,6 +63,9 @@ Section "InstallFiles"
 
   DetailPrint "Trying to uninstall new helper..."
   ClearErrors
+  ExecWait '"$INSTDIR\helper.exe" stop'
+  ExecWait '"$INSTDIR\helper.exe" remove'
+  ClearErrors
   Delete 'C:\Program Files\$applicationName\helper.exe'
   IfErrors 0 noErrorHelper
 
-- 
cgit v1.2.3