aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Folder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-02-06 22:25:23 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-02-06 22:25:23 -0500
commit504e2099e2f11203c48dff94a67ec797a454d459 (patch)
tree5371a9339be0530ed5e17988251c91a2dc030ee2 /MediaBrowser.Controller/Entities/Folder.cs
parent7320567b9eb9179fabebf918df226a187ae2d55f (diff)
update dlna profiles
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs17
1 files changed, 14 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 50f33f5c0..e85dee354 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -787,9 +787,20 @@ namespace MediaBrowser.Controller.Entities
Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);
- var items = query.Recursive
- ? GetRecursiveChildren(user, filter)
- : GetChildren(user, true).Where(filter);
+ IEnumerable<BaseItem> items;
+
+ if (query.User == null)
+ {
+ items = query.Recursive
+ ? GetRecursiveChildren(filter)
+ : Children.Where(filter);
+ }
+ else
+ {
+ items = query.Recursive
+ ? GetRecursiveChildren(user, filter)
+ : GetChildren(user, true).Where(filter);
+ }
var result = PostFilterAndSort(items, query);