GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix loading null as Guid for object refs in C++ Json parser

Browse Source
This commit is contained in:
Wojtek Figat
2021-08-27 16:06:23 +02:00
parent 7f00fa4fd9
commit e4cb87ea9e
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Core/Config/GameSettings.cpp
View File

@@ -188,7 +188,7 @@ void GameSettings::Deserialize(DeserializeStream& stream, ISerializeModifier* mo
SplashScreen = JsonTools::GetGuid(stream, "SplashScreen");
CustomSettings.Clear();
const auto customSettings = stream.FindMember("CustomSettings");
if (customSettings != stream.MemberEnd())
if (customSettings != stream.MemberEnd() && customSettings->value.IsArray())
{
auto& items = customSettings->value;
for (auto it = items.MemberBegin(); it != items.MemberEnd(); ++it)