diff options
| author | cvium <clausvium@gmail.com> | 2021-11-09 16:00:14 +0100 |
|---|---|---|
| committer | cvium <clausvium@gmail.com> | 2021-11-09 16:00:14 +0100 |
| commit | 2b02b53fc03341a03f3339afd9aae40280a12e1c (patch) | |
| tree | 088adda39016911626fffab1f8414b980c57464e /Jellyfin.Api/Helpers/TranscodingJobHelper.cs | |
| parent | 996500b2f805e3f46e36f52cff2c80794a0390c6 (diff) | |
| parent | 04040b25e03295d9268fd7bc38ffce8f27f5c004 (diff) | |
Merge branch 'master' into dlnope_never_again
Diffstat (limited to 'Jellyfin.Api/Helpers/TranscodingJobHelper.cs')
| -rw-r--r-- | Jellyfin.Api/Helpers/TranscodingJobHelper.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs index 07d0b5543..f435bbf00 100644 --- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs +++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs @@ -283,6 +283,7 @@ namespace Jellyfin.Api.Helpers lock (job.ProcessLock!) { + #pragma warning disable CA1849 // Can't await in lock block job.TranscodingThrottler?.Stop().GetAwaiter().GetResult(); var process = job.Process; @@ -308,6 +309,7 @@ namespace Jellyfin.Api.Helpers { } } + #pragma warning restore CA1849 } if (delete(job.Path!)) |