diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-19 09:04:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 09:04:49 +0000 |
| commit | ef05485243b1d0043b442a4f5ab4cc9be99f16bb (patch) | |
| tree | 39fbf843ae9ebb0c15902d18c3617aece339df50 /Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs | |
| parent | 3ffdcfdb802079ee9ad3e76527b4519f3fe4458a (diff) | |
| parent | 49ebbcf87edb805862c032e48796d2b8020e5aa7 (diff) | |
Merge branch 'master' into PluginConfigSave
Diffstat (limited to 'Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs')
| -rw-r--r-- | Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs b/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs index b9507a4e5..9edc19bb6 100644 --- a/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs +++ b/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs @@ -196,7 +196,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos /// Start kill timer. /// </summary> /// <param name="callback">Callback action.</param> - public void StartKillTimer(Action<object> callback) + public void StartKillTimer(Action<object?> callback) { StartKillTimer(callback, PingTimeout); } @@ -206,7 +206,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos /// </summary> /// <param name="callback">Callback action.</param> /// <param name="intervalMs">Callback interval.</param> - public void StartKillTimer(Action<object> callback, int intervalMs) + public void StartKillTimer(Action<object?> callback, int intervalMs) { if (HasExited) { |