From 33014f77aaacb91cfbd820052f1a49af66a214e3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 26 May 2017 02:48:54 -0400
Subject: update GetItems method

---
 MediaBrowser.Controller/Channels/Channel.cs         | 6 +++---
 MediaBrowser.Controller/Channels/IChannelManager.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller/Channels')

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.
-- 
cgit v1.2.3