mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #6139] [MERGED] Don't dispose managed CancellationTokenSource #10834
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/6139
Author: @crobibero
Created: 6/2/2021
Status: ✅ Merged
Merged: 6/4/2021
Merged by: @Bond-009
Base:
master← Head:cts📝 Commits (4)
3629682Don't dispose CTS, add commentsb986ee1Properly dispose of all TranscodingJobDto resources2f05c9aRemove whitespacef44882eFlip inverted condition📊 Changes
7 files changed (+36 additions, -4 deletions)
View changed files
📝
Jellyfin.Api/Controllers/DynamicHlsController.cs(+2 -1)📝
Jellyfin.Api/Controllers/VideoHlsController.cs(+1 -0)📝
Jellyfin.Api/Controllers/VideosController.cs(+1 -0)📝
Jellyfin.Api/Helpers/AudioHelper.cs(+2 -0)📝
Jellyfin.Api/Helpers/DynamicHlsHelper.cs(+1 -0)📝
Jellyfin.Api/Helpers/TranscodingJobHelper.cs(+2 -2)📝
Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs(+27 -1)📄 Description
Fixes an issue reported here.
Fixes https://github.com/jellyfin/jellyfin/issues/6141
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.