paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 06:19:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: fix watch-result enumerator

Browse Source
This commit is contained in:
Martin 2022-07-21 23:07:25 +02:00
parent 0dfb936053
commit a2578a496f
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ide/packages/idedebugger/idedebuggerwatchresult.pas
View File

@ -3881,23 +3881,30 @@ end;
function TGenericWatchResultDataStruct.TWatchResultDataStructEnumerator.MoveNext: Boolean;
begin
if FSubEnumerator <> nil then begin
if FSubEnumerator.MoveNext then
Result := FSubEnumerator.MoveNext;
if Result then
exit
else
FreeAndNil(FSubEnumerator);
end;
inc(FIndex);
Result := FIndex < FSource.FieldCount;
repeat
inc(FIndex);
Result := FIndex < FSource.FieldCount;
if Result and (dffVariant in FSource.Fields[FIndex].FieldFlags) then begin
FSubOwner := FSource.Fields[FIndex].Owner;
FSubEnumerator := TGenericWatchResultDataStruct.TWatchResultDataStructVariantEnumerator.Create(
FSource.Fields[FIndex].Field
);
if not FSubEnumerator.MoveNext then
FreeAndNil(FSubEnumerator);
end;
if Result and (dffVariant in FSource.Fields[FIndex].FieldFlags) then begin
FSubOwner := FSource.Fields[FIndex].Owner;
FSubEnumerator := TGenericWatchResultDataStruct.TWatchResultDataStructVariantEnumerator.Create(
FSource.Fields[FIndex].Field
);
if not FSubEnumerator.MoveNext then begin
FreeAndNil(FSubEnumerator);
Continue;
end;
end;
break;
until True;
end;
{ TGenericWatchResultDataStruct.TNestedFieldsWatchResultStorage }