diff options
| author | Rich Lander <rlander@microsoft.com> | 2021-07-30 10:44:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 10:44:43 -0700 |
| commit | 47da13613b143794e1f1422e05dac63a40f5f66a (patch) | |
| tree | 59ec139682ed5a61f7c24ccf9e6df434cffad04a /MediaBrowser.Controller/Channels/Channel.cs | |
| parent | 927b003143f7e4772e21b767f2524f969ddf1ad8 (diff) | |
| parent | 0ee74b293d1f6fa1be63b8b4e5e2498a7f18298f (diff) | |
Merge branch 'master' into media-provides-analysis-fixes
Diffstat (limited to 'MediaBrowser.Controller/Channels/Channel.cs')
| -rw-r--r-- | MediaBrowser.Controller/Channels/Channel.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs index 26a936be0..e6923b55c 100644 --- a/MediaBrowser.Controller/Channels/Channel.cs +++ b/MediaBrowser.Controller/Channels/Channel.cs @@ -17,6 +17,12 @@ namespace MediaBrowser.Controller.Channels { public class Channel : Folder { + [JsonIgnore] + public override bool SupportsInheritedParentImages => false; + + [JsonIgnore] + public override SourceType SourceType => SourceType.Channel; + public override bool IsVisible(User user) { var blockedChannelsPreference = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedChannels); @@ -39,12 +45,6 @@ namespace MediaBrowser.Controller.Channels return base.IsVisible(user); } - [JsonIgnore] - public override bool SupportsInheritedParentImages => false; - - [JsonIgnore] - public override SourceType SourceType => SourceType.Channel; - protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query) { try |
