alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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/Encoder/MediaEncoder.cs
View File

@@ -596,7 +596,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
timeoutMs = DefaultImageExtractionTimeout;
}
ranToCompletion = await process.WaitForExitAsync(timeoutMs).ConfigureAwait(false);
ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMilliseconds(timeoutMs)).ConfigureAwait(false);
if (!ranToCompletion)
{
@@ -729,7 +729,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
while (isResponsive)
{
if (await process.WaitForExitAsync(30000).ConfigureAwait(false))
if (await process.WaitForExitAsync(TimeSpan.FromSeconds(30)).ConfigureAwait(false))
{
ranToCompletion = true;
break;