Merge pull request #904 from ironmansoftware/248

Fixes #248
ironmansoftware · Jun 24, 2019 · 3474a45 · 3474a45
2 parents 33c9dfd + 87bb1ce
commit 3474a45
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/UniversalDashboard/Utilities/PSObjectJsonConvert.cs b/src/UniversalDashboard/Utilities/PSObjectJsonConvert.cs
@@ -35,17 +35,22 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var dictionary = value.ToDictionary() as Dictionary<string, object>;
+            var obj = value.ToDictionary();
 
-            writer.WriteStartObject();
-
-            foreach (var property in dictionary)
+            if (obj is Dictionary<string, object> dictionary)
             {
-                writer.WritePropertyName(property.Key);
-                serializer.Serialize(writer, property.Value);
+                writer.WriteStartObject();
+
+                foreach (var property in dictionary)
+                {
+                    writer.WritePropertyName(property.Key);
+                    serializer.Serialize(writer, property.Value);
+                }
+
+                writer.WriteEndObject();
             }
 
-            writer.WriteEndObject();
+            writer.WriteValue(obj);
         }
     }
 }