From 2d56a44117ca44b120aefb4887fa0fa2cf16518f Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Tue, 18 May 2021 12:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E6=AE=8B=E7=95=99?=
 =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E6=97=B6=E5=90=AF=E5=8A=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationInstance.cs                    | 35 ++++++++++++++++---
 .../CommandLineTools.cs                       | 23 ++++++++++--
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs b/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs
index 2dc6cfb73..2c1c3f0b6 100644
--- a/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Pipes;
@@ -35,7 +36,7 @@ namespace System.Application.UI
             }
         }
 
-        static bool GetIsFirst()
+        static IEnumerable<Process> GetCurrentAllProcess()
         {
             var current = Process.GetCurrentProcess();
             var query = from p in Process.GetProcessesByName(current.ProcessName)
@@ -46,6 +47,29 @@ namespace System.Application.UI
                                     p.MainModule.FileName == current.MainModule.FileName &&
                                         p.MainModule.ModuleName == current.MainModule.ModuleName))
                         select p;
+            return query;
+        }
+
+        public static bool TryKillCurrentAllProcess()
+        {
+            foreach (var p in GetCurrentAllProcess())
+            {
+                try
+                {
+                    p.Kill(true);
+                    p.WaitForExit(500);
+                }
+                catch
+                {
+
+                }
+            }
+            return GetIsFirst();
+        }
+
+        static bool GetIsFirst()
+        {
+            var query = GetCurrentAllProcess();
             var r = query.Any();
             return !r;
         }
@@ -97,19 +121,20 @@ namespace System.Application.UI
         /// 给主进程发送消息
         /// </summary>
         /// <param name="value"></param>
-        public static void SendMessage(string value)
+        public static bool SendMessage(string value)
         {
             var name = GetPipeName();
             try
             {
                 using var pipeClient = new NamedPipeClientStream(".", name, PipeDirection.Out, PipeOptions.None, TokenImpersonationLevel.Impersonation);
-                pipeClient.Connect();
+                pipeClient.Connect(1000);
                 using StreamWriter sw = new StreamWriter(pipeClient);
                 sw.WriteLine(value);
+                return true;
             }
-            catch (IOException)
+            catch
             {
-
+                return false;
             }
         }
 
diff --git a/src/ST.Client.Desktop.Avalonia.App/CommandLineTools.cs b/src/ST.Client.Desktop.Avalonia.App/CommandLineTools.cs
index fbb3a5189..90d72acd6 100644
--- a/src/ST.Client.Desktop.Avalonia.App/CommandLineTools.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/CommandLineTools.cs
@@ -39,12 +39,29 @@ namespace System.Application.UI
 #endif
                     if (IsMainProcess)
                     {
-                        appInstance = new ApplicationInstance();
+                        var isInitAppInstanceReset = false;
+                    initAppInstance: appInstance = new ApplicationInstance();
                         if (!appInstance.IsFirst)
                         {
                             //Console.WriteLine("ApplicationInstance.SendMessage(string.Empty);");
-                            ApplicationInstance.SendMessage(string.Empty);
-                            return;
+                            if (ApplicationInstance.SendMessage(string.Empty))
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                if (!isInitAppInstanceReset &&
+                                    ApplicationInstance.TryKillCurrentAllProcess())
+                                {
+                                    isInitAppInstanceReset = true;
+                                    appInstance.Dispose();
+                                    goto initAppInstance;
+                                }
+                                else
+                                {
+                                    return;
+                                }
+                            }
                         }
                         appInstance.MessageReceived += value =>
                         {