Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

2 files changed, 3 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index 89395a00b5..980c3d14a5 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -16,15 +16,14 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public override bool IsVisible(User user)
         {
-            return base.IsVisible(user) && GetRecursiveChildren(user, false)
+            return base.IsVisible(user) && GetChildren(user, false)
                 .OfType<Playlist>()
                 .Any(i => i.IsVisible(user));
         }
 
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {
-            return RecursiveChildren
-                .OfType<Playlist>();
+            return GetRecursiveChildren(i => i is Playlist);
         }
 
         public override bool IsHidden
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index 8da9ba2226..c511f40e0f 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -81,8 +81,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
                         var folder = item as Folder;
                         if (folder != null)
                         {
-                            options.MediaType = folder.GetRecursiveChildren()
-                                .Where(i => !i.IsFolder && i.SupportsAddingToPlaylist)
+                            options.MediaType = folder.GetRecursiveChildren(i => !i.IsFolder && i.SupportsAddingToPlaylist)
                                 .Select(i => i.MediaType)
                                 .FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
                         }