fix: 关服时崩溃

SereinDev · Dec 30, 2024 · ac4256a · ac4256a
1 parent 4179769
commit ac4256a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Serein.Core/Services/Servers/ServerWithPty.cs b/src/Serein.Core/Services/Servers/ServerWithPty.cs
@@ -105,8 +105,8 @@ protected override void StartProcess()
                         _ptyConnection.Dispose();
                         _ptyConnection = null;
                         _process = null;
-                        _streamReader?.Close();
                         OnServerExit(e.ExitCode);
+                        _streamReader?.Close();
                         _cancellationTokenSource.Cancel();
                     };
                     _streamReader = new(
@@ -137,10 +137,19 @@ private async Task ReadLineLoop()
                     OnServerOutput(line);
                 }
             }
+            catch (ObjectDisposedException)
+            {
+                break;
+            }
             catch (OperationCanceledException)
             {
                 break;
             }
+            catch (Exception e)
+            {
+                WriteErrorLine(e.Message);
+                _logger.LogDebug(e, "读取服务器输出时发生错误");
+            }
         }
 
         _streamReader?.Dispose();