OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-11-13 01:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes

Browse Source
This commit is contained in:
Mark Cilia Vincenti committed 2024-02-03 08:45:14 +01:00
2 parents e47144e7c7 e4f715bbee
commit f26fc7dfb2
161 files changed
+2771 -2390
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+1 -6
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;