diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-26 12:25:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 12:25:43 -0400 |
| commit | 84077e824df3bda4f74e12b961d4e962b0e04a42 (patch) | |
| tree | b2df17cd1648ef4c6fe16610abce2e04af8dfa7e /MediaBrowser.Controller/Channels | |
| parent | 40bc3b7b2205d7bc0802cf81bf199c655b81efd7 (diff) | |
| parent | 89ba154522ed12f7ba64cc8190843f20795c728e (diff) | |
Merge pull request #2666 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Channels')
| -rw-r--r-- | MediaBrowser.Controller/Channels/Channel.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Channels/IChannelManager.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs index a2590dec72..35c2ea1aac 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 { diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs index 7927446289..824bdf8ffb 100644 --- a/MediaBrowser.Controller/Channels/IChannelManager.cs +++ b/MediaBrowser.Controller/Channels/IChannelManager.cs @@ -110,7 +110,7 @@ namespace MediaBrowser.Controller.Channels /// <param name="item">The item.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{IEnumerable{MediaSourceInfo}}.</returns> - Task<IEnumerable<MediaSourceInfo>> GetStaticMediaSources(BaseItem item, CancellationToken cancellationToken); + IEnumerable<MediaSourceInfo> GetStaticMediaSources(BaseItem item, CancellationToken cancellationToken); /// <summary> /// Gets the channel folder. |