Merge pull request #3032 from MediaBrowser/beta

Beta

1 files changed, 2 insertions, 14 deletions

diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index c42f22804..c566ca25b 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Channels
 
             if (requiresCallback != null)
             {
-                results = await GetChannelItemMediaSourcesInternal(requiresCallback, GetItemExternalId(item), cancellationToken)
+                results = await GetChannelItemMediaSourcesInternal(requiresCallback, item.ExternalId, cancellationToken)
                     .ConfigureAwait(false);
             }
             else
@@ -990,18 +990,6 @@ namespace Emby.Server.Implementations.Channels
             return result;
         }
 
-        private string GetItemExternalId(BaseItem item)
-        {
-            var externalId = item.ExternalId;
-
-            if (string.IsNullOrWhiteSpace(externalId))
-            {
-                externalId = item.GetProviderId("ProviderExternalId");
-            }
-
-            return externalId;
-        }
-
         private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(1, 1);
         private async Task<ChannelItemResult> GetChannelItems(IChannel channel,
             User user,
@@ -1080,7 +1068,7 @@ namespace Emby.Server.Implementations.Channels
                 {
                     var categoryItem = _libraryManager.GetItemById(new Guid(folderId));
 
-                    query.FolderId = GetItemExternalId(categoryItem);
+                    query.FolderId = categoryItem.ExternalId;
                 }
 
                 var result = await channel.GetChannelItems(query, cancellationToken).ConfigureAwait(false);