diff options
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 6 |
2 files changed, 5 insertions, 16 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index e01b8857f..ed950b1c5 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -899,21 +899,6 @@ namespace MediaBrowser.Controller.Entities { var current = this; - var currentAsPlaceHolder = current as ISupportsPlaceHolders; - - if (currentAsPlaceHolder != null) - { - var newHasPlaceHolder = newItem as ISupportsPlaceHolders; - - if (newHasPlaceHolder != null) - { - if (currentAsPlaceHolder.IsPlaceHolder != newHasPlaceHolder.IsPlaceHolder) - { - return false; - } - } - } - return current.IsInMixedFolder == newItem.IsInMixedFolder; } diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 6b098cbd8..0c6125dbe 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -363,7 +363,11 @@ namespace MediaBrowser.Controller.Entities { await base.UpdateToRepository(updateReason, cancellationToken).ConfigureAwait(false); - foreach (var item in GetLocalAlternateVersionIds().Select(i => LibraryManager.GetItemById(i))) + var localAlternates = GetLocalAlternateVersionIds() + .Select(i => LibraryManager.GetItemById(i)) + .Where(i => i != null); + + foreach (var item in localAlternates) { item.ImageInfos = ImageInfos; item.Overview = Overview; |