aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/UserLibrary/ItemsService.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-05-26 12:25:43 -0400
committerGitHub <noreply@github.com>2017-05-26 12:25:43 -0400
commit84077e824df3bda4f74e12b961d4e962b0e04a42 (patch)
treeb2df17cd1648ef4c6fe16610abce2e04af8dfa7e /MediaBrowser.Api/UserLibrary/ItemsService.cs
parent40bc3b7b2205d7bc0802cf81bf199c655b81efd7 (diff)
parent89ba154522ed12f7ba64cc8190843f20795c728e (diff)
Merge pull request #2666 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api/UserLibrary/ItemsService.cs')
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index d4811e603..01e1ce769 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -105,7 +105,7 @@ namespace MediaBrowser.Api.UserLibrary
var dtoOptions = GetDtoOptions(_authContext, request);
- var result = await GetQueryResult(request, dtoOptions, user).ConfigureAwait(false);
+ var result = GetQueryResult(request, dtoOptions, user);
if (result == null)
{
@@ -134,7 +134,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <summary>
/// Gets the items to serialize.
/// </summary>
- private async Task<QueryResult<BaseItem>> GetQueryResult(GetItems request, DtoOptions dtoOptions, User user)
+ private QueryResult<BaseItem> GetQueryResult(GetItems request, DtoOptions dtoOptions, User user)
{
var item = string.IsNullOrEmpty(request.ParentId) ?
null :
@@ -169,14 +169,14 @@ namespace MediaBrowser.Api.UserLibrary
if (request.Recursive || !string.IsNullOrEmpty(request.Ids) || user == null)
{
- return await folder.GetItems(GetItemsQuery(request, dtoOptions, user)).ConfigureAwait(false);
+ return folder.GetItems(GetItemsQuery(request, dtoOptions, user));
}
var userRoot = item as UserRootFolder;
if (userRoot == null)
{
- return await folder.GetItems(GetItemsQuery(request, dtoOptions, user)).ConfigureAwait(false);
+ return folder.GetItems(GetItemsQuery(request, dtoOptions, user));
}
IEnumerable<BaseItem> items = folder.GetChildren(user, true);