Merge pull request #1567 from MediaBrowser/dev

update playlist querying

1 files changed, 5 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 3d4e90671..efb784153 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -830,8 +830,11 @@ namespace MediaBrowser.Controller.Entities
         {
             if (LinkedChildren.Count > 0)
             {
-                Logger.Debug("Query requires post-filtering due to LinkedChildren");
-                return true;
+                if (!(this is ICollectionFolder))
+                {
+                    Logger.Debug("Query requires post-filtering due to LinkedChildren");
+                    return true;
+                }
             }
 
             if (query.SortBy != null && query.SortBy.Length > 0)