Merge pull request #175 from DHancock/dev

Dev
DHancock · Aug 12, 2024 · 2e8a5fa · 2e8a5fa
2 parents 0f53ba9 + b2d60d8
commit 2e8a5fa
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/Countdown/Countdown.csproj b/Countdown/Countdown.csproj
@@ -15,8 +15,8 @@
     <ApplicationIcon>Resources\app.ico</ApplicationIcon>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
 	<WindowsPackageType>None</WindowsPackageType>
-    <AssemblyVersion>3.10.1.0</AssemblyVersion>
-    <FileVersion>3.10.1.0</FileVersion>
+    <AssemblyVersion>3.10.2.0</AssemblyVersion>
+    <FileVersion>3.10.2.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Countdown/Installer/inno_script.iss b/Countdown/Installer/inno_script.iss
@@ -58,8 +58,7 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"
 Filename: "{app}\{#appExeName}"; Description: "{cm:LaunchProgram,{#appName}}"; Flags: nowait postinstall skipifsilent
 
 [UninstallRun]
-Filename: "{app}\{#appExeName}"; Parameters: "/uninstall"; 
-Filename: powershell.exe; Parameters: "Get-Process '{#appName}' | where Path -eq '{app}\{#appExeName}' | kill -Force"; Flags: runhidden
+Filename: "{app}\{#appExeName}"; Parameters: "/uninstall";
 
 [Code]
 

diff --git a/Countdown/Program.cs b/Countdown/Program.cs
@@ -12,6 +12,7 @@ static void Main(string[] args)
         if ((args.Length == 1) && (args[0] == "/uninstall"))
         {
             DeleteAppData();
+            KillOtherProcesses();
         }
         else
         {             
@@ -36,4 +37,24 @@ private static void DeleteAppData()
             Trace.WriteLine(ex.ToString());
         }
     }
+
+    private static void KillOtherProcesses()
+    {
+        try
+        {
+            Process thisProcess = Process.GetCurrentProcess();
+
+            foreach (Process process in Process.GetProcessesByName(thisProcess.ProcessName))
+            {
+                if ((process.Id != thisProcess.Id) && (process.MainModule?.FileName == thisProcess.MainModule?.FileName))
+                {
+                    process.Kill(); // ensure uninstall is able to complete
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Trace.WriteLine(ex.ToString());
+        }
+    }
 }