adds a process id to the NauDto. the updater checks if the process is…

… running and kills the process after 1,5 seconds (waiting for mutex has some problems under windows XP)
phillipp · Dec 12, 2012 · a14325d · a14325d
1 parent acfbb69
commit a14325d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/NAppUpdate.Framework/UpdateManager.cs b/src/NAppUpdate.Framework/UpdateManager.cs
@@ -450,6 +450,7 @@ public void ApplyUpdates(bool relaunchApplication, bool updaterDoLogging, bool u
 						          		WorkingDirectory = Environment.CurrentDirectory,
 						          		RelaunchApplication = relaunchApplication,
 						          		LogItems = Logger.LogItems,
+                                        ProcessId = Process.GetCurrentProcess().Id
 						          	};
 
 						NauIpc.ExtractUpdaterFromResource(Config.TempFolder, Instance.Config.UpdateExecutableName);

diff --git a/src/NAppUpdate.Framework/Utils/NauIpc.cs b/src/NAppUpdate.Framework/Utils/NauIpc.cs
@@ -26,6 +26,7 @@ internal class NauDto
 			public string AppPath { get; set; }
 			public string WorkingDirectory { get; set; }
 			public bool RelaunchApplication { get; set; }
+            public int ProcessId { get; set; }
 		}
 
 		[DllImport("kernel32.dll", SetLastError = true)]

diff --git a/src/NAppUpdate.Updater/AppStart.cs b/src/NAppUpdate.Updater/AppStart.cs
@@ -94,6 +94,8 @@ private static void Main()
 					}
 				}
 
+                WaitForProcessTerminate(dto);
+
 				bool updateSuccessful = true;
 
 				if (dto == null || dto.Configs == null)
@@ -220,7 +222,26 @@ private static void Main()
 			}
 		}
 
-		private static void SelfCleanUp(string tempFolder)
+	    private static void WaitForProcessTerminate(NauIpc.NauDto dto) {
+	        try {
+	            if (dto != null) {
+	                int i = 0;
+	                do {
+	                    Process.GetProcessById(dto.ProcessId);
+	                    Log("Process {0} still running...", dto.ProcessId);
+	                    i++;
+	                    Thread.Sleep(500);
+	                } while (i <= 3);
+	                Log("Killing process {0}...", dto.ProcessId);
+	                Process.GetProcessById(dto.ProcessId).Kill();
+	            }
+	        }
+	        catch (Exception) {
+	            // parent process has exited
+	        }
+	    }
+
+	    private static void SelfCleanUp(string tempFolder)
 		{
 			// Delete the updater EXE and the temp folder
 			Log("Removing updater and temp folder... {0}", tempFolder);