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

Merge branch 'master' into bdiso-playback

Browse Source
This commit is contained in:
Stan
2020-10-28 13:18:05 +01:00
committed by GitHub
parent cd4641dca0 be2f27a069
commit 3bb8884e16
309 changed files with 4116 additions and 7046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Jellyfin.Api/Helpers/TranscodingJobHelper.cs
View File

@@ -740,10 +740,7 @@ namespace Jellyfin.Api.Helpers
/// <param name="state">The state.</param>
private void OnFfMpegProcessExited(Process process, TranscodingJobDto job, StreamState state)
{
if (job != null)
{
job.HasExited = true;
}
job.HasExited = true;
_logger.LogDebug("Disposing stream resources");
state.Dispose();