From 17662abef1fcbffc852ca5d538c9307a5ef15341 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Thu, 17 Nov 2022 15:42:40 +0800
Subject: [PATCH] Fixed bug where certain null objects in deserialization was
 not handled

---
 .../Serialisation/SerialisationUtilities.h++  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++ b/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
index dde6705a..2c943452 100644
--- a/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
+++ b/SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
@@ -142,6 +142,31 @@ namespace SHADE
     bool SerialisationUtilities::fieldAssignYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node)
     {
         System::Object^ valueObj = fieldInfo->GetValue(object);
+        if (valueObj == nullptr)
+        {
+            if constexpr (std::is_same_v<FieldType, System::Enum>)
+            {
+                if (fieldInfo->FieldType->IsSubclassOf(System::Enum::typeid))
+                {
+                    valueObj = 0;
+                }
+            }
+            else 
+            {
+                if (fieldInfo->FieldType == FieldType::typeid)
+                {
+                    if constexpr (std::is_same_v<FieldType, System::String>)
+                    {
+                        valueObj = "";
+                    }
+                    else
+                    {
+                        valueObj = FieldType();
+                    }
+                }
+            }            
+        }
+
         if (varAssignYamlInternal<FieldType>(valueObj, node))
         {
             fieldInfo->SetValue(object, valueObj);