aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Session
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-08-01 12:46:37 -0400
committerGitHub <noreply@github.com>2017-08-01 12:46:37 -0400
commitcd8642a4bcba48b035e34ab46fd51eacb43b4d3b (patch)
tree107db4f9281aedf50fa9e8abf2fcc0e4f2dea9f8 /Emby.Server.Implementations/Session
parentff42e5987f48fcfd29914c7666e65f4976b32927 (diff)
parent30e673a4679a3c1f0e6a5f4027cccb266b6c2561 (diff)
Merge pull request #2790 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Session')
-rw-r--r--Emby.Server.Implementations/Session/SessionManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 317f40a37..763ca9f24 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1089,7 +1089,7 @@ namespace Emby.Server.Implementations.Session
{
var folder = (Folder)item;
- var itemsResult = folder.GetItems(new InternalItemsQuery(user)
+ var itemsResult = folder.GetItemList(new InternalItemsQuery(user)
{
Recursive = true,
IsFolder = false,
@@ -1104,7 +1104,7 @@ namespace Emby.Server.Implementations.Session
});
- return FilterToSingleMediaType(itemsResult.Items)
+ return FilterToSingleMediaType(itemsResult)
.OrderBy(i => i.SortName)
.ToList();
}