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

Unregister Cancellation Event by disposing the delegate

Browse source
This commit is contained in:
Hongtao Zhang 2022-08-21 20:58:17 -04:00
parent c3dd3b1851
commit ddb25a253a
No known key found for this signature in database
GPG key ID: 75F655B91C7AC9BB
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ using Flow.Launcher.Core.Resource;
using Flow.Launcher.Infrastructure;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
@ -254,24 +255,17 @@ namespace Flow.Launcher.Core.Plugin
return Stream.Null;
}
var sourceBuffer = BufferManager.GetStream();
var errorBuffer = BufferManager.GetStream();
using var errorBuffer = BufferManager.GetStream();
var sourceCopyTask = process.StandardOutput.BaseStream.CopyToAsync(sourceBuffer, token);
var errorCopyTask = process.StandardError.BaseStream.CopyToAsync(errorBuffer, token);
token.Register(() =>
await using var registeredEvent = token.Register(() =>
{
try
{
if (!process.HasExited)
process.Kill();
}
catch (InvalidOperationException)
{
}
if (!process.HasExited)
process.Kill();
sourceBuffer.Dispose();
});
try
@ -303,7 +297,7 @@ namespace Flow.Launcher.Core.Plugin
if (errorBuffer.Length != 0)
{
using var error = new StreamReader(errorBuffer);
var errorMessage = await error.ReadToEndAsync();
if (!string.IsNullOrEmpty(errorMessage))