1 files changed, 19 insertions, 19 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index bf47ada0d..d1e089850 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1057,11 +1057,21 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>IList{BaseItem}.</returns>
         public IList<BaseItem> GetRecursiveChildren()
         {
-            return GetRecursiveChildren(i => true);
+            return GetRecursiveChildren(true);
+        }
+
+        public IList<BaseItem> GetRecursiveChildren(bool includeLinkedChildren)
+        {
+            return GetRecursiveChildren(i => true, includeLinkedChildren);
         }
 
         public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
         {
+            return GetRecursiveChildren(filter, true);
+        }
+
+        public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter, bool includeLinkedChildren)
+        {
             var result = new Dictionary<Guid, BaseItem>();
 
             AddChildrenToList(result, true, true, filter);
@@ -1139,29 +1149,19 @@ namespace MediaBrowser.Controller.Entities
             return LinkedChildren
                 .Select(i =>
                 {
-                    var requiresPostFilter = true;
-
-                    if (!string.IsNullOrWhiteSpace(i.Path))
-                    {
-                        requiresPostFilter = false;
-
-                        if (!locations.Any(l => FileSystem.ContainsSubPath(l, i.Path)))
-                        {
-                            return null;
-                        }
-                    }
-
                     var child = GetLinkedChild(i);
 
-                    if (requiresPostFilter && child != null)
+                    if (child != null)
                     {
-                        if (string.IsNullOrWhiteSpace(child.Path))
+                        var childLocationType = child.LocationType;
+                        if (childLocationType == LocationType.Remote || childLocationType == LocationType.Virtual)
                         {
-                            Logger.Debug("Found LinkedChild with null path: {0}", child.Name);
-                            return child;
+                            if (!child.IsVisibleStandalone(user))
+                            {
+                                return null;
+                            }
                         }
-
-                        if (!locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
+                        else if (childLocationType == LocationType.FileSystem && !locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
                         {
                             return null;
                         }