diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-06 22:51:09 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-06 22:51:09 -0400 |
| commit | 5d5a0e3addd206f86a10e5be127efde0453cd419 (patch) | |
| tree | 0554322a0f26335297983f2423177af81b4fd5bd /MediaBrowser.Controller/Playlists | |
| parent | 56e4d6730f5a0e0103cd6c397cc0f1b26935d5c9 (diff) | |
updated nuget
Diffstat (limited to 'MediaBrowser.Controller/Playlists')
| -rw-r--r-- | MediaBrowser.Controller/Playlists/Playlist.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs index 5ea535f4d5..a2335b4bc3 100644 --- a/MediaBrowser.Controller/Playlists/Playlist.cs +++ b/MediaBrowser.Controller/Playlists/Playlist.cs @@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Playlists public IEnumerable<BaseItem> GetManageableItems() { - return GetLinkedChildren(); + return GetPlaylistItems(MediaType, GetLinkedChildren(), null); } private IEnumerable<BaseItem> GetPlayableItems(User user) @@ -40,8 +40,12 @@ namespace MediaBrowser.Controller.Playlists if (folder != null) { - var items = folder.GetRecursiveChildren(user, true) - .Where(m => !m.IsFolder && string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase)); + var items = user == null + ? folder.GetRecursiveChildren() + : folder.GetRecursiveChildren(user, true); + + items = items + .Where(m => !m.IsFolder); if (!folder.IsPreSorted) { @@ -52,7 +56,8 @@ namespace MediaBrowser.Controller.Playlists } return new[] { i }; - }); + + }).Where(m => string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase)); } [IgnoreDataMember] |
