aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-14 13:02:41 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-14 13:02:41 -0500
commit86c68d7e2a0c2bafa89b1390057ff798bfaacb23 (patch)
tree0800333653469dbd6e247e8b95e2b2d497a1f5c7 /MediaBrowser.Server.Implementations/Library/LibraryManager.cs
parent36e525f5ffe62805d2702fa1b905d612130e085c (diff)
parent3e0e64b31f7fa0596fc12597dbf1493a8601f8c0 (diff)
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/LibraryManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index e4cb58346..333b1fbe9 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1324,7 +1324,7 @@ namespace MediaBrowser.Server.Implementations.Library
SetTopParentIdsOrAncestors(query, parents);
- return GetItemIds(query).Select(GetItemById);
+ return GetItemIds(query).Select(GetItemById).Where(i => i != null);
}
public QueryResult<BaseItem> GetItemsResult(InternalItemsQuery query, IEnumerable<string> parentIds)