diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-10-20 15:16:01 -0400 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-10-20 15:17:39 -0400 |
| commit | 6e59671cf6e8214406c74bae8aec80a49c6e72b3 (patch) | |
| tree | 4495f913820480efd7150246ddd6cb4326bb74c3 /MediaBrowser.Controller/Channels/Channel.cs | |
| parent | 86a50367b2a72f97450dc6fba4af4c0ec9984a55 (diff) | |
Merge pull request #1898 from Bond-009/jsonfix
Fix Json serialization error
(cherry picked from commit 91600b1c81872e1745401942633a87085dc706b5)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
Diffstat (limited to 'MediaBrowser.Controller/Channels/Channel.cs')
| -rw-r--r-- | MediaBrowser.Controller/Channels/Channel.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs index 89159973b..cdf2ca69e 100644 --- a/MediaBrowser.Controller/Channels/Channel.cs +++ b/MediaBrowser.Controller/Channels/Channel.cs @@ -1,11 +1,11 @@ using System; using System.Globalization; using System.Linq; +using System.Text.Json.Serialization; using System.Threading; using MediaBrowser.Common.Progress; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Querying; -using MediaBrowser.Model.Serialization; namespace MediaBrowser.Controller.Channels { @@ -31,10 +31,10 @@ namespace MediaBrowser.Controller.Channels return base.IsVisible(user); } - [IgnoreDataMember] + [JsonIgnore] public override bool SupportsInheritedParentImages => false; - [IgnoreDataMember] + [JsonIgnore] public override SourceType SourceType => SourceType.Channel; protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query) |
