CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-27 04:16:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Use a TimeSpan instead of ms and support providing a custom CancellationToken

Browse source
This commit is contained in:
Mark Monteiro 2020-03-27 01:09:09 +01:00
parent 7447ea8960
commit 97c36d11d4
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View file

@ -451,7 +451,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw;
}
var ranToCompletion = await process.WaitForExitAsync(300000).ConfigureAwait(false);
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
if (!ranToCompletion)
{
@ -599,7 +599,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw;
}
var ranToCompletion = await process.WaitForExitAsync(300000).ConfigureAwait(false);
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
if (!ranToCompletion)
{