From a176613119e579fb726088d1f22073dc8e9558ba Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 11 Jan 2025 10:44:34 +0800
Subject: [PATCH] Bug fix for ProcUtils

---
 v2rayN/ServiceLib/Common/ProcUtils.cs    | 27 +++++++++++++++++++++---
 v2rayN/ServiceLib/Handler/AppHandler.cs  |  8 ++++++-
 v2rayN/ServiceLib/Handler/CoreHandler.cs |  1 +
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/v2rayN/ServiceLib/Common/ProcUtils.cs b/v2rayN/ServiceLib/Common/ProcUtils.cs
index 653d94af..b58ca41c 100644
--- a/v2rayN/ServiceLib/Common/ProcUtils.cs
+++ b/v2rayN/ServiceLib/Common/ProcUtils.cs
@@ -81,9 +81,7 @@ public static class ProcUtils
             return;
         }
 
-        var procId = review ? proc?.Id : null;
-        var fileName = review ? proc?.MainModule?.FileName : null;
-        var processName = review ? proc?.ProcessName : null;
+        GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
 
         try { proc?.Kill(true); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
         try { proc?.Kill(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
@@ -91,6 +89,29 @@ public static class ProcUtils
         try { proc?.Dispose(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
 
         await Task.Delay(300);
+        await ProcessKillByKeyInfo(review, procId, fileName, processName);
+    }
+
+    private static void GetProcessKeyInfo(Process? proc, bool review, out int? procId, out string? fileName, out string? processName)
+    {
+        procId = null;
+        fileName = null;
+        processName = null;
+        if (!review) return;
+        try
+        {
+            procId = proc?.Id;
+            fileName = proc?.MainModule?.FileName;
+            processName = proc?.ProcessName;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static async Task ProcessKillByKeyInfo(bool review, int? procId, string? fileName, string? processName)
+    {
         if (review && procId != null && fileName != null)
         {
             try
diff --git a/v2rayN/ServiceLib/Handler/AppHandler.cs b/v2rayN/ServiceLib/Handler/AppHandler.cs
index bf94fdf9..b0dfe232 100644
--- a/v2rayN/ServiceLib/Handler/AppHandler.cs
+++ b/v2rayN/ServiceLib/Handler/AppHandler.cs
@@ -106,7 +106,13 @@
             if (Utils.IsWindows())
             {
                 _processJob ??= new();
-                _processJob?.AddProcess(processHandle);
+                try
+                {
+                    _processJob?.AddProcess(processHandle);
+                }
+                catch
+                {
+                }
             }
         }
 
diff --git a/v2rayN/ServiceLib/Handler/CoreHandler.cs b/v2rayN/ServiceLib/Handler/CoreHandler.cs
index 32451ba1..a4922af7 100644
--- a/v2rayN/ServiceLib/Handler/CoreHandler.cs
+++ b/v2rayN/ServiceLib/Handler/CoreHandler.cs
@@ -258,6 +258,7 @@ namespace ServiceLib.Handler
                     proc.BeginErrorReadLine();
                 }
 
+                AppHandler.Instance.AddProcess(proc.Handle);
                 if (proc.WaitForExit(1000))
                 {
                     proc.CancelErrorRead();