From c28215b93eb6e4b14ed266e8309761e023dfe16b Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 23 Apr 2021 12:47:17 +0200 Subject: [PATCH] Fix UTF-8 encoding read in 2 places --- Source/Engine/Localization/LocalizedString.h | 4 ++-- Source/Engine/Localization/LocalizedStringTable.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Engine/Localization/LocalizedString.h b/Source/Engine/Localization/LocalizedString.h index 7646029df..cde965329 100644 --- a/Source/Engine/Localization/LocalizedString.h +++ b/Source/Engine/Localization/LocalizedString.h @@ -99,10 +99,10 @@ namespace Serialization { auto e = SERIALIZE_FIND_MEMBER(stream, "Id"); if (e != stream.MemberEnd()) - v.Id = e->value.GetString(); + v.Id.SetUTF8(e->value.GetString(), e->value.GetStringLength()); e = SERIALIZE_FIND_MEMBER(stream, "Value"); if (e != stream.MemberEnd()) - v.Value = e->value.GetString(); + v.Value.SetUTF8(e->value.GetString(), e->value.GetStringLength()); } else { diff --git a/Source/Engine/Localization/LocalizedStringTable.cpp b/Source/Engine/Localization/LocalizedStringTable.cpp index bb2b1e8a7..e9cb33a46 100644 --- a/Source/Engine/Localization/LocalizedStringTable.cpp +++ b/Source/Engine/Localization/LocalizedStringTable.cpp @@ -120,7 +120,7 @@ Asset::LoadResult LocalizedStringTable::loadAsset() { e.Resize(value.Size()); for (int32 q = 0; q < e.Count(); q++) - e[q] = value[q].GetString(); + e[q] = value[q].GetText(); } } }