diff options
| author | crobibero <cody@robibe.ro> | 2020-11-20 11:21:24 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-20 11:21:24 -0700 |
| commit | 5b8e248d724ff236747c25d487fd9fa0f7c9d7c3 (patch) | |
| tree | b8d59320bcece305183f588901caba423d0e0e22 /Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs | |
| parent | 20dcb7d5c3e492a356ec64d92b2feff7badf97c7 (diff) | |
| parent | d2cef78db3c6f5c1063f8205ed5309f5243be66b (diff) | |
Merge remote-tracking branch 'upstream/master' into video-resolver
Diffstat (limited to 'Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs')
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs index 56f4133a0..3a9e28458 100644 --- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs +++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs @@ -653,7 +653,7 @@ namespace Emby.Server.Implementations.ScheduledTasks try { _logger.LogInformation(Name + ": Waiting on Task"); - var exited = Task.WaitAll(new[] { task }, 2000); + var exited = task.Wait(2000); if (exited) { |