diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/IIntroProvider.cs | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 95a68c009..bcf62115c 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -6,6 +6,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; +using MoreLinq; using System; using System.Collections; using System.Collections.Concurrent; @@ -1009,10 +1010,10 @@ namespace MediaBrowser.Controller.Entities continue; } - hasLinkedChildren = true; - if (child.IsVisible(user)) { + hasLinkedChildren = true; + list.Add(child); } } @@ -1058,7 +1059,7 @@ namespace MediaBrowser.Controller.Entities if (includeLinkedChildren && hasLinkedChildren) { - list = list.Distinct().ToList(); + list = list.DistinctBy(i => i.Id).ToList(); } return list; diff --git a/MediaBrowser.Controller/Library/IIntroProvider.cs b/MediaBrowser.Controller/Library/IIntroProvider.cs index f54c3a329..990fa933c 100644 --- a/MediaBrowser.Controller/Library/IIntroProvider.cs +++ b/MediaBrowser.Controller/Library/IIntroProvider.cs @@ -15,5 +15,11 @@ namespace MediaBrowser.Controller.Library /// <param name="user">The user.</param> /// <returns>IEnumerable{System.String}.</returns> IEnumerable<string> GetIntros(BaseItem item, User user); + + /// <summary> + /// Gets all intros. + /// </summary> + /// <returns>IEnumerable{System.String}.</returns> + IEnumerable<string> GetAllIntros(); } } |