aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Channels/Channel.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-26 02:48:54 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-26 02:48:54 -0400
commit33014f77aaacb91cfbd820052f1a49af66a214e3 (patch)
tree97e5d61917219563013a7487f449e77c00492d3f /MediaBrowser.Controller/Channels/Channel.cs
parentd21e8d3c3361a9d4f17c8bef8bc4245f1c8ce968 (diff)
update GetItems method
Diffstat (limited to 'MediaBrowser.Controller/Channels/Channel.cs')
-rw-r--r--MediaBrowser.Controller/Channels/Channel.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index a2590dec7..35c2ea1aa 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -38,12 +38,12 @@ namespace MediaBrowser.Controller.Channels
set { }
}
- protected override async Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query)
+ protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)
{
try
{
// Don't blow up here because it could cause parent screens with other content to fail
- return await ChannelManager.GetChannelItemsInternal(new ChannelItemQuery
+ return ChannelManager.GetChannelItemsInternal(new ChannelItemQuery
{
ChannelId = Id.ToString("N"),
Limit = query.Limit,
@@ -52,7 +52,7 @@ namespace MediaBrowser.Controller.Channels
SortBy = query.SortBy,
SortOrder = query.SortOrder
- }, new Progress<double>(), CancellationToken.None);
+ }, new Progress<double>(), CancellationToken.None).Result;
}
catch
{