sync updates

2 files changed, 22 insertions, 16 deletions

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index 0e0e4fbcb..e0b616605 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -170,23 +170,29 @@ namespace MediaBrowser.Server.Implementations.Channels
             foreach (var item in result.Items)
             {
                 var channelItem = (IChannelItem)item;
-                if (options.DownloadingChannels.Contains(channelItem.ChannelId))
+
+                var channelFeatures = _manager.GetChannelFeatures(channelItem.ChannelId);
+
+                if (channelFeatures.SupportsContentDownloading)
                 {
-                    try
-                    {
-                        await DownloadChannelItem(item, options, cancellationToken, path);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        break;
-                    }
-                    catch (ChannelDownloadException)
-                    {
-                        // Logged at lower levels
-                    }
-                    catch (Exception ex)
+                    if (options.DownloadingChannels.Contains(channelItem.ChannelId))
                     {
-                        _logger.ErrorException("Error downloading channel content for {0}", ex, item.Name);
+                        try
+                        {
+                            await DownloadChannelItem(item, options, cancellationToken, path);
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            break;
+                        }
+                        catch (ChannelDownloadException)
+                        {
+                            // Logged at lower levels
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.ErrorException("Error downloading channel content for {0}", ex, item.Name);
+                        }
                     }
                 }
 
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 37536a4ee..2b17442de 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -508,7 +508,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 SupportsLatestMedia = supportsLatest,
                 Name = channel.Name,
                 Id = channel.Id.ToString("N"),
-                SupportsContentDownloading = isIndexable || supportsLatest,
+                SupportsContentDownloading = features.SupportsContentDownloading && (isIndexable || supportsLatest),
                 AutoRefreshLevels = features.AutoRefreshLevels
             };
         }