aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/UserLibrary/ItemsService.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-17 13:11:59 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-17 13:11:59 -0400
commit365b2d82b15bac2d652a57d562c9d9d1175f6179 (patch)
tree715c48e7530b3bd242c2b5bd3ae9e26a9525ec8b /MediaBrowser.Api/UserLibrary/ItemsService.cs
parent1c72aac1c2d6379127bc3c27eb6f243c22cea0e4 (diff)
parentdc264a2cf1568f1e439115b4426c1eefb5c46442 (diff)
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
Diffstat (limited to 'MediaBrowser.Api/UserLibrary/ItemsService.cs')
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index a6f1d8b98..57acb07ac 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -101,7 +101,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
- var result = await GetItemsToSerialize(request, user).ConfigureAwait(false);
+ var result = await GetQueryResult(request, user).ConfigureAwait(false);
if (result == null)
{
@@ -135,7 +135,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="request">The request.</param>
/// <param name="user">The user.</param>
/// <returns>IEnumerable{BaseItem}.</returns>
- private async Task<QueryResult<BaseItem>> GetItemsToSerialize(GetItems request, User user)
+ private async Task<QueryResult<BaseItem>> GetQueryResult(GetItems request, User user)
{
var item = string.IsNullOrEmpty(request.ParentId) ?
user == null ? _libraryManager.RootFolder : user.RootFolder :