diff options
| author | Stepan <ste.martinek+git@gmail.com> | 2020-11-10 12:42:49 +0100 |
|---|---|---|
| committer | Stepan <ste.martinek+git@gmail.com> | 2020-11-10 12:42:49 +0100 |
| commit | c0747512d6d3973ac102ea4990d2e1fa44e5a5d1 (patch) | |
| tree | 2cf9ad33386422dfb00757237b68523e60284034 /MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs | |
| parent | 3d1076ae42433314835f4277ff42cd5ef1e6c016 (diff) | |
| parent | cdf979efef94dc29f4ef0b4ad3f918b4983560e5 (diff) | |
Merge remote-tracking branch 'jellyfin/master' into emby-namig-nullable
Diffstat (limited to 'MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs')
| -rw-r--r-- | MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs index b7b1daf76..24ed3ea19 100644 --- a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs +++ b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverterFactory.cs @@ -21,8 +21,8 @@ namespace MediaBrowser.Common.Json.Converters /// <inheritdoc /> public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options) { - var structType = typeToConvert.GetElementType(); + var structType = typeToConvert.GetElementType() ?? typeToConvert.GenericTypeArguments[0]; return (JsonConverter)Activator.CreateInstance(typeof(JsonCommaDelimitedArrayConverter<>).MakeGenericType(structType)); } } -}
\ No newline at end of file +} |