From 610763b637a0ca42e9999bb6509db61456d5f426 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sat, 28 Aug 2021 12:16:13 +0200 Subject: [PATCH] Fix custom setting loading regression --- Source/Engine/Core/Config/GameSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Engine/Core/Config/GameSettings.cpp b/Source/Engine/Core/Config/GameSettings.cpp index 3ae273867..da8e00216 100644 --- a/Source/Engine/Core/Config/GameSettings.cpp +++ b/Source/Engine/Core/Config/GameSettings.cpp @@ -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() && customSettings->value.IsArray()) + if (customSettings != stream.MemberEnd() && (customSettings->value.IsObject() || customSettings->value.IsArray())) { auto& items = customSettings->value; for (auto it = items.MemberBegin(); it != items.MemberEnd(); ++it)