From 9ad49540d2911bca0afdace0fd7bf2be28661b16 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Fri, 10 May 2019 16:04:11 -0400 Subject: [PATCH] fix: Fixing JSON converter error when handling default existing value with struct types --- ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs index fd51bab..f70a137 100644 --- a/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs +++ b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs @@ -103,7 +103,10 @@ namespace ICD.Common.Utils.Json if (serializer == null) throw new ArgumentNullException("serializer"); - return ReadJson(reader, (T)existingValue, serializer); + // Casting null blows up struct casts + T cast = (T)(existingValue ?? default(T)); + + return ReadJson(reader, cast, serializer); } ///