|
|
@@ -246,7 +246,7 @@ begin
|
|
|
tkNull : NullValue;
|
|
|
tkTrue,
|
|
|
tkFalse : BooleanValue(t=tkTrue);
|
|
|
- tkString : if (joUTF8 in Options) and (DefaultSystemCodePage<>CP_UTF8) then
|
|
|
+ tkString : if ((joUTF8 in Options) or (DefaultSystemCodePage<>CP_UTF8)) and (TypeInfo(TJSONStringType) <> TypeInfo(UTF8String)) then
|
|
|
StringValue(TJSONStringType(UTF8Decode(CurrentTokenString)))
|
|
|
else
|
|
|
StringValue(CurrentTokenString);
|