aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Folder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-08-25 14:26:39 -0400
committerGitHub <noreply@github.com>2016-08-25 14:26:39 -0400
commit259c5b9d44bc098b213a408adc8abfaacf4a106f (patch)
tree6a1bd02d91972640a616fae633e2c23ce2b56e0a /MediaBrowser.Controller/Entities/Folder.cs
parentc9c3f0e07d359de24a547c3e620694bc5fe0096b (diff)
parent2b61894e3ce1c0ec6d188a6be550cf22c2f84fa9 (diff)
Merge pull request #2099 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index bea648a3d..bf47ada0d 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -891,16 +891,16 @@ namespace MediaBrowser.Controller.Entities
{
if (query.ItemIds.Length > 0)
{
- var specificItems = query.ItemIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList();
+ var result = LibraryManager.GetItemsResult(query);
if (query.SortBy.Length == 0)
{
var ids = query.ItemIds.ToList();
// Try to preserve order
- specificItems = specificItems.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToList();
+ result.Items = result.Items.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToArray();
}
- return Task.FromResult(PostFilterAndSort(specificItems, query, true, true));
+ return Task.FromResult(result);
}
return GetItemsInternal(query);