fix: 先关闭游戏再关闭本程序将不会产生Textractor报错

hanmin0822 · Feb 11, 2023 · a6d982d · a6d982d
1 parent 2d53e3a
commit a6d982d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/MisakaTranslator-WPF/Properties/AssemblyInfo.cs b/MisakaTranslator-WPF/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 [assembly : AssemblyCulture("")]
 [assembly : ComVisible(false)]
 [assembly : ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly : AssemblyVersion("2.12.1.0")]
-[assembly : AssemblyFileVersion("2.12.1.0")]
+[assembly : AssemblyVersion("2.12.2.0")]
+[assembly : AssemblyFileVersion("2.12.2.0")]
diff --git a/TextHookLibrary/ProcessHelper.cs b/TextHookLibrary/ProcessHelper.cs
@@ -116,5 +116,10 @@ public static string FindProcessPath(int pid, bool isx64game = false)
                         catch (InvalidOperationException) { } // 进程已退出
             return l;
         }
+
+        /// <summary>
+        /// internal bool System.Diagnostics.ProcessManager.IsProcessRunning(int pid)
+        /// </summary>
+        public static Func<int, bool> IsProcessRunning = (Func<int, bool>)typeof(Process).Assembly.GetType("System.Diagnostics.ProcessManager").GetMethod("IsProcessRunning", new[] { typeof(int) }).CreateDelegate(typeof(Func<int, bool>));
     }
 }
diff --git a/TextHookLibrary/TextHookHandle.cs b/TextHookLibrary/TextHookHandle.cs
@@ -182,6 +182,8 @@ public async Task AttachProcess(int pid) {
         /// </summary>
         /// <param name="pid"></param>
         public async Task DetachProcess(int pid) {
+            if (!ProcessHelper.IsProcessRunning(pid))
+                return;
             await ProcessTextractor.StandardInput.WriteLineAsync("detach -P" + pid);
             await ProcessTextractor.StandardInput.FlushAsync();
         }
@@ -213,13 +215,14 @@ public async Task DetachProcessByHookAddress(int pid, string HookAddress) {
         /// </summary>
         public async void CloseTextractor() {
             if (ProcessTextractor != null && ProcessTextractor.HasExited == false) {
-                if (HandleMode == 1) {
+                if (HandleMode == 1 && ProcessHelper.IsProcessRunning(GamePID)) {
                     await DetachProcess(GamePID);
                 }
                 else if (HandleMode == 2) {
                     foreach (var item in PossibleGameProcessList.ToList())
                         if (PossibleGameProcessList[item.Key] == true) {
-                            await DetachProcess(item.Key.Id);
+                            if(ProcessHelper.IsProcessRunning(item.Key.Id))
+                                await DetachProcess(item.Key.Id);
                             PossibleGameProcessList[item.Key] = false;
                         }
                 }

diff --git a/index.html b/index.html
@@ -1,3 +1,3 @@
 This is AutoUpdateCheck's Page.
-LatestVersion[2.12.1.0]
+LatestVersion[2.12.2.0]
 DownloadPath[https://github.com/hanmin0822/MisakaTranslator/releases]