aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-29 11:22:30 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-29 11:22:30 -0500
commit14f3bb6b19dbfec028086e2c0ced90979bccc939 (patch)
tree768b4fee0ac5ea0fe61de1a43a8261fa2cd3c8a4 /MediaBrowser.Server.Implementations/Library/UserViewManager.cs
parent771db85d094f0e2298465f50cab3ae8802d2eeca (diff)
update channels
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/UserViewManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/UserViewManager.cs11
1 files changed, 1 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index aca13e088..63d1d4cb8 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -124,16 +124,7 @@ namespace MediaBrowser.Server.Implementations.Library
var channels = channelResult.Items;
- var embeddedChannels = channels
- .Where(i => user.Configuration.DisplayChannelsInline || user.Configuration.DisplayChannelsWithinViews.Contains(i.Id.ToString("N")))
- .ToList();
-
- list.AddRange(embeddedChannels);
-
- if (channels.Length > embeddedChannels.Count)
- {
- list.Add(await _channelManager.GetInternalChannelFolder(cancellationToken).ConfigureAwait(false));
- }
+ list.AddRange(channels);
if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
{