alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-16 15:24:10 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #2642 from mark-monteiro/fix-extras

Browse Source 
Add missing null check when retrieving extras
This commit is contained in:
Joshua M. Boniface
2020-03-22 15:10:23 -04:00
committed by GitHub
parent 0d9787dfb4 6897a19051
commit 425bd2b01b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -178,6 +178,7 @@ namespace MediaBrowser.Controller.Entities
[JsonIgnore]
public int? TotalBitrate { get; set; }
[JsonIgnore]
public ExtraType? ExtraType { get; set; }
@@ -2884,7 +2885,7 @@ namespace MediaBrowser.Controller.Entities
public IEnumerable<BaseItem> GetExtras(IReadOnlyCollection<ExtraType> extraTypes)
{
return ExtraIds.Select(LibraryManager.GetItemById).Where(i => i != null && extraTypes.Contains(i.ExtraType.Value));
return ExtraIds.Select(LibraryManager.GetItemById).Where(i => i?.ExtraType != null && extraTypes.Contains(i.ExtraType.Value));
}
public IEnumerable<BaseItem> GetTrailers()