From 91baa4f133a4a6beb5ea71566d51f166ee96935b Mon Sep 17 00:00:00 2001
From: albertony <12441419+albertony@users.noreply.github.com>
Date: Fri, 11 Dec 2020 18:38:51 +0100
Subject: [PATCH] Perform clean uninstall on windows

---
 dist/inno/barrier.iss.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dist/inno/barrier.iss.in b/dist/inno/barrier.iss.in
index 54b2036a..908a38eb 100644
--- a/dist/inno/barrier.iss.in
+++ b/dist/inno/barrier.iss.in
@@ -26,6 +26,7 @@ SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
 Compression=lzma
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64 ia64
+UninstallDisplayIcon={app}\{#MyAppExeName}
 
 #include "scripts\lang\english.iss"
 
@@ -51,10 +52,11 @@ Filename: {sys}\sc.exe; Parameters: "start {#MyAppServiceName}"; Flags: runhidde
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [UninstallDelete]
-Type: files; Name: "{app}\barrierd.log"
+Type: filesandordirs; Name: "{commonappdata}\Barrier"
 
 [UninstallRun]
-Filename: {sys}\sc.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden
+Filename: {sys}\taskkill; Parameters: "/im {#MyAppExeName} /f /t"; Flags: runhidden
+Filename: {sys}\net.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "delete {#MyAppServiceName}"; Flags: runhidden
 Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden