2 files changed, 21 insertions, 18 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index bfdbb8ccf..ce939aeb4 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -95,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
         public static string GetUserDistinctValue(User user)
         {
-            var channels = user.Configuration.BlockedChannels
+            var channels = user.Policy.BlockedChannels
                 .OrderBy(i => i)
                 .ToList();
 
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
index 72c524ec5..d266cca6c 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -72,26 +72,29 @@ namespace MediaBrowser.Server.Implementations.Channels
                 var features = _channelManager.GetChannelFeatures(channelId);
 
                 const int currentRefreshLevel = 1;
-                var maxRefreshLevel = features.AutoRefreshLevels ?? 1;
+                var maxRefreshLevel = features.AutoRefreshLevels ?? 0;
 
-                var innerProgress = new ActionableProgress<double>();
-
-                var startingNumberComplete = numComplete;
-                innerProgress.RegisterAction(p =>
+                if (maxRefreshLevel > 0)
                 {
-                    double innerPercent = startingNumberComplete;
-                    innerPercent += (p / 100);
-                    innerPercent /= numItems;
-                    progress.Report(innerPercent * 100);
-                });
+                    var innerProgress = new ActionableProgress<double>();
 
-                try
-                {
-                    await GetAllItems(user, channelId, null, currentRefreshLevel, maxRefreshLevel, innerProgress, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error getting channel content", ex);
+                    var startingNumberComplete = numComplete;
+                    innerProgress.RegisterAction(p =>
+                    {
+                        double innerPercent = startingNumberComplete;
+                        innerPercent += (p / 100);
+                        innerPercent /= numItems;
+                        progress.Report(innerPercent * 100);
+                    });
+
+                    try
+                    {
+                        await GetAllItems(user, channelId, null, currentRefreshLevel, maxRefreshLevel, innerProgress, cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error getting channel content", ex);
+                    }
                 }
 
                 numComplete++;