Merge pull request #1052 from AtomicGameEngine/JME-ATOMIC-1051

Fixes #1051, better JSON to rapid json logic (set value before adding to array/object)

Source/Atomic/Resource/JSONFile.cpp

@@ -185,9 +185,12 @@ static void ToRapidjsonValue(rapidjson::Value& rapidjsonValue, const JSONValue&
 
             for (unsigned i = 0; i < jsonArray.Size(); ++i)
             {
+// ATOMIC BEGIN
+                // ATOMIC: Set value before adding to array, see note in JSON_OBJECT case below
                 rapidjson::Value value;
-                rapidjsonValue.PushBack(value, allocator);
-                ToRapidjsonValue(rapidjsonValue[i], jsonArray[i], allocator);
+                ToRapidjsonValue(value, jsonArray[i], allocator);
+                rapidjsonValue.PushBack(value, allocator);                
+// ATOMIC END
             }
         }
         break;
@@ -199,10 +202,15 @@ static void ToRapidjsonValue(rapidjson::Value& rapidjsonValue, const JSONValue&
             rapidjsonValue.SetObject();
             for (JSONObject::ConstIterator i = jsonObject.Begin(); i != jsonObject.End(); ++i)
             {
+// ATOMIC BEGIN
+                // ATOMIC: Set value before adding member, this fixes a rapidjson crash
+                // when trying to immediately find member (VS2015, release build, difficult to reproduce)
+                // TODO: Submit a PR to upstream
                 const char* name = i->first_.CString();
                 rapidjson::Value value;
-                rapidjsonValue.AddMember(name, value, allocator);
-                ToRapidjsonValue(rapidjsonValue[name], i->second_, allocator);
+                ToRapidjsonValue(value, i->second_, allocator);
+                rapidjsonValue.AddMember(name, value, allocator);                
+// ATOMIC END
             }
         }
         break;