Bug fix lazarus

viniciussanchez · Dec 14, 2023 · 7a036ca · 7a036ca
1 parent 54aeba4
commit 7a036ca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/DataSet.Serialize.pas b/src/DataSet.Serialize.pas
@@ -352,15 +352,19 @@ procedure TDataSetSerializeHelper.LoadFromJSON(const AJSONObject: TJSONObject; c
 
 procedure TDataSetSerializeHelper.LoadFromJSON(const AJSONObject: TJSONObject; const ARootElement: string = ''; const AOwns: Boolean = True);
 var
-  LJSON: TJSONValue;
+  LJSON: {$IF DEFINED(FPC)}TJSONData{$ELSE}TJSONValue{$ENDIF};
   LJSONSerialize: TJSONSerialize;
 begin
   if ARootElement.Trim.IsEmpty then
     LJSONSerialize := TJSONSerialize.Create(AJSONObject, AOwns)
   else
   begin
     try
+      {$IF DEFINED(FPC)}
+      LJSON := AJSONObject.Find(ARootElement);
+      {$ELSE}
       LJSON := AJSONObject.FindValue(ARootElement);
+      {$ENDIF}
       if not Assigned(LJSON) then
         raise Exception.Create('Root element not found!');
       if LJSON.InheritsFrom(TJSONArray) then
@@ -431,4 +435,4 @@ procedure TDataSetSerializeHelper.MergeFromJSONObject(const AJSONString: string)
     MergeFromJSONObject({$IF DEFINED(FPC)}GetJSON(AJSONString){$ELSE}TJSONObject.ParseJSONValue(TEncoding.UTF8.GetBytes(AJSONString), 0){$ENDIF} as TJSONObject)
 end;
 
-end.
+end.