prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Manually kill process when token is canceled

Browse source
This commit is contained in:
张弘韬 2021-07-27 13:54:13 +08:00
parent 4e3746f77d
commit 220db44a6c
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
View file

@ -243,9 +243,18 @@ namespace Flow.Launcher.Core.Plugin
return Stream.Null; return Stream.Null;
} }
var source = process.StandardOutput.BaseStream; await using var source = process.StandardOutput.BaseStream;
var buffer = BufferManager.GetStream(); var buffer = BufferManager.GetStream();
bool disposed = false;
process.Disposed += (_, _) => { disposed = true; };
token.Register(() =>
{
if (!disposed)
// ReSharper disable once AccessToDisposedClosure
// Manually Check whether disposed
process.Kill();
});
try try
{ {
@ -260,7 +269,7 @@ namespace Flow.Launcher.Core.Plugin
buffer.Seek(0, SeekOrigin.Begin); buffer.Seek(0, SeekOrigin.Begin);
token.ThrowIfCancellationRequested(); token.ThrowIfCancellationRequested();
if (!process.StandardError.EndOfStream) if (!process.StandardError.EndOfStream)
{ {
using var standardError = process.StandardError; using var standardError = process.StandardError;