Merge branch 'master' into fix-hdhomerun

1 files changed, 1 insertions, 6 deletions

diff --git a/MediaBrowser.Common/Json/JsonDefaults.cs b/MediaBrowser.Common/Json/JsonDefaults.cs
index 67f7e8f14..6605ae962 100644
--- a/MediaBrowser.Common/Json/JsonDefaults.cs
+++ b/MediaBrowser.Common/Json/JsonDefaults.cs
@@ -39,14 +39,9 @@ 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));
+            options.Converters.Add(new JsonNullableStructConverterFactory());
 
             return options;
         }