CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-29 21:17:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge changes

Browse source
This commit is contained in:
Mark Cilia Vincenti 2024-02-03 08:45:14 +01:00
commit f26fc7dfb2
161 changed files with 2771 additions and 2390 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -904,8 +904,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
bool ranToCompletion = false;
await _thumbnailResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
try
using (await _thumbnailResourcePool.LockAsync(cancellationToken).ConfigureAwait(false))
{
StartProcess(processWrapper);
@ -959,10 +958,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
StopProcess(processWrapper, 1000);
}
}
finally
{
_thumbnailResourcePool.Release();
}
var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;