diff options
| author | Patrick Barron <18354464+barronpm@users.noreply.github.com> | 2020-09-03 15:57:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 15:57:16 +0000 |
| commit | 15135dc3b8a2421b6b4d550fa5e141e064d5bf82 (patch) | |
| tree | aaf94c0c43ae32eea429319ee700be8ba0f9ab4c /MediaBrowser.Common/Json/JsonDefaults.cs | |
| parent | 602e746af058daf317fd8a92b2538619d00d6414 (diff) | |
| parent | 0712a7ef11c24c2aa51bbfa74dfa311af24c90bb (diff) | |
Merge branch 'master' into jellyfin-data-warnings
Diffstat (limited to 'MediaBrowser.Common/Json/JsonDefaults.cs')
| -rw-r--r-- | MediaBrowser.Common/Json/JsonDefaults.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs index 9d30927db..5867cd4a0 100644 --- a/MediaBrowser.Common/Json/JsonDefaults.cs +++ b/MediaBrowser.Common/Json/JsonDefaults.cs @@ -29,8 +29,14 @@ namespace MediaBrowser.Common.Json NumberHandling = JsonNumberHandling.AllowReadingFromString }; + // Get built-in converters for fallback converting. + var baseNullableInt32Converter = (JsonConverter<int?>)options.GetConverter(typeof(int?)); + var baseNullableInt64Converter = (JsonConverter<long?>)options.GetConverter(typeof(long?)); + options.Converters.Add(new JsonGuidConverter()); options.Converters.Add(new JsonStringEnumConverter()); + options.Converters.Add(new JsonNullableStructConverter<int>(baseNullableInt32Converter)); + options.Converters.Add(new JsonNullableStructConverter<long>(baseNullableInt64Converter)); return options; } |