Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-11-14 02:04:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cancel on exit

Browse source 
Former-commit-id: 31685da18a
This commit is contained in:
Malte Rosenbjerg 2020-10-25 18:23:55 +01:00
parent 2b78be6d27
commit 0f27130e8a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs
View file

@ -55,6 +55,7 @@ void OnCancelEvent(object sender, EventArgs args)
cancellationTokenSource.Cancel(); cancellationTokenSource.Cancel();
} }
CancelEvent += OnCancelEvent; CancelEvent += OnCancelEvent;
instance.Exited += delegate { cancellationTokenSource.Cancel(); };
_ffMpegArguments.Pre(); _ffMpegArguments.Pre();
try try
@ -128,7 +129,6 @@ private Instance PrepareInstance(out CancellationTokenSource cancellationTokenSo
FFMpegHelper.RootExceptionCheck(); FFMpegHelper.RootExceptionCheck();
FFMpegHelper.VerifyFFMpegExists(); FFMpegHelper.VerifyFFMpegExists();
var instance = new Instance(FFMpegOptions.Options.FFmpegBinary(), _ffMpegArguments.Text); var instance = new Instance(FFMpegOptions.Options.FFmpegBinary(), _ffMpegArguments.Text);
instance.DataReceived += OutputData;
cancellationTokenSource = new CancellationTokenSource(); cancellationTokenSource = new CancellationTokenSource();
if (_onTimeProgress != null || (_onPercentageProgress != null && _totalTimespan != null)) if (_onTimeProgress != null || (_onPercentageProgress != null && _totalTimespan != null))