aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Session
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2019-10-20 15:16:01 -0400
committerJoshua Boniface <joshua@boniface.me>2019-10-20 15:17:39 -0400
commit6e59671cf6e8214406c74bae8aec80a49c6e72b3 (patch)
tree4495f913820480efd7150246ddd6cb4326bb74c3 /MediaBrowser.Controller/Session
parent86a50367b2a72f97450dc6fba4af4c0ec9984a55 (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/Session')
-rw-r--r--MediaBrowser.Controller/Session/SessionInfo.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index f0e81e8e7a..acda6a4166 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -1,9 +1,9 @@
using System;
using System.Linq;
+using System.Text.Json.Serialization;
using System.Threading;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Session;
using Microsoft.Extensions.Logging;
@@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Session
/// Gets or sets the session controller.
/// </summary>
/// <value>The session controller.</value>
- [IgnoreDataMember]
+ [JsonIgnore]
public ISessionController[] SessionControllers { get; set; }
/// <summary>