alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into http-exception

Browse Source
This commit is contained in:
crobibero
2020-11-15 13:09:05 -07:00
parent 95a2de757f 2f426dfc97
commit e66d79fc0c
76 changed files with 532 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
View File

@@ -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)
{

2
Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
View File

@@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
try
{
previouslyFailedImages = File.ReadAllText(failHistoryPath)
.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
.Split('|', StringSplitOptions.RemoveEmptyEntries)
.ToList();
}
catch (IOException)