|
@@ -1149,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;
|
|
|
}
|