Attempt to gracefully exit process if possible with "terminate"

praydog · Jun 22, 2024 · 33b18b0 · 33b18b0
1 parent cdbf10b
commit 33b18b0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/UEVR/MainWindow.xaml.cs b/UEVR/MainWindow.xaml.cs
@@ -31,6 +31,7 @@
 using static UEVR.SharedMemory;
 using System.Threading.Channels;
 using System.Security.Principal;
+using System.Windows.Media.Animation;
 
 namespace UEVR {
     class GameSettingEntry : INotifyPropertyChanged {
@@ -979,7 +980,19 @@ private void Inject_Clicked(object sender, RoutedEventArgs e) {
 
                     if (pid != null) {
                         var target = Process.GetProcessById((int)pid);
-                        target.CloseMainWindow();
+
+                        if (target == null || target.HasExited) {
+                            return;
+                        }
+
+                        target.WaitForInputIdle(100);
+
+                        SharedMemory.SendCommand(SharedMemory.Command.Quit);
+
+                        if (target.WaitForExit(2000)) {
+                            return;
+                        }
+
                         target.Kill();
                     }
                 } catch(Exception) {

diff --git a/UEVR/UEVRSharedMemory.cs b/UEVR/UEVRSharedMemory.cs
@@ -35,7 +35,8 @@ public struct Data {
 
         public enum Command {
             ReloadConfig,
-            ConfigSetupAcknowledged
+            ConfigSetupAcknowledged,
+            Quit
         };
 
         public static string SharedMemoryName = "UnrealVRMod";