From 31685da18ae8b60157fc8f4ffa20d3de51869ab2 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 25 Oct 2020 18:23:55 +0100 Subject: [PATCH] Cancel on exit --- FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs b/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs index ebfac20..0f39b71 100644 --- a/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs +++ b/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs @@ -55,6 +55,7 @@ void OnCancelEvent(object sender, EventArgs args) cancellationTokenSource.Cancel(); } CancelEvent += OnCancelEvent; + instance.Exited += delegate { cancellationTokenSource.Cancel(); }; _ffMpegArguments.Pre(); try @@ -128,7 +129,6 @@ private Instance PrepareInstance(out CancellationTokenSource cancellationTokenSo FFMpegHelper.RootExceptionCheck(); FFMpegHelper.VerifyFFMpegExists(); var instance = new Instance(FFMpegOptions.Options.FFmpegBinary(), _ffMpegArguments.Text); - instance.DataReceived += OutputData; cancellationTokenSource = new CancellationTokenSource(); if (_onTimeProgress != null || (_onPercentageProgress != null && _totalTimespan != null))