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

DBG: Inspect-Dialog, prevent crash, due to nested updates

Browse Source 
git-svn-id: trunk@39280 -
This commit is contained in:
martin 2012-11-15 14:46:30 +00:00
parent f0f98b8cad
commit 1a23649a97
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
debugger/inspectdlg.pas
View File

@ -72,6 +72,7 @@ type
FDBGInfo: TDBGType;
FGridData: TStringGrid;
FGridMethods: TStringGrid;
FUpdateLock, FUpdateNeeded: Boolean;
procedure Localize;
procedure InspectClass;
procedure InspectRecord;
@ -461,7 +462,6 @@ begin
MethodsPage.TabVisible:=false;
GridDataSetup;
FGridData.Visible := False;
FreeAndNil(FDBGInfo);
StatusBar1.SimpleText:='';
end;
@ -509,6 +509,7 @@ constructor TIDEInspectDlg.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
//FDBGInfo := nil;
//FDataGridHook := TPropertyEditorHook.Create;
//FDataGrid := NewGrid('DataGrid', DataPage, FDataGridHook);
//
@ -518,6 +519,8 @@ begin
//FMethodsGridHook := TPropertyEditorHook.Create;
//FMethodsGrid := NewGrid('MethodsGrid', MethodsPage, FMethodsGridHook);
FUpdateLock := False;
FUpdateNeeded := False;
Localize;
FGridData:=TStringGrid.Create(DataPage);
@ -554,37 +557,55 @@ procedure TIDEInspectDlg.UpdateData;
var
Opts: TDBGEvaluateFlags;
begin
FreeAndNil(FDBGInfo);
if FExpression = ''
then exit;
if FUpdateLock then begin
FUpdateNeeded := True;
exit;
end;
InputHistories.HistoryLists.Add(ClassName, FExpression,rltCaseSensitive);
if EdInspect.Items.IndexOf(FExpression) = -1
then EdInspect.Items.Insert(0, FExpression);
Opts := [defFullTypeInfo];
if menuClassType.Checked then
include(Opts, defClassAutoCast);
if not DebugBoss.Evaluate(FExpression, FHumanReadable, FDBGInfo, Opts)
or not assigned(FDBGInfo) then
begin
FUpdateLock := True;
FUpdateNeeded := False;
try
FreeAndNil(FDBGInfo);
Clear;
StatusBar1.SimpleText:=FExpression + ' : unavailable';
Exit;
end;
case FDBGInfo.Kind of
skClass: InspectClass();
skRecord: InspectRecord();
skVariant: InspectVariant();
skEnum: InspectEnum;
skSet: InspectSet;
skProcedure: InspectSimple;
skFunction: InspectSimple;
skSimple: InspectSimple();
skPointer: InspectPointer();
// skDecomposable: ;
if FExpression = ''
then begin
Clear;
StatusBar1.SimpleText := '';
exit;
end;
InputHistories.HistoryLists.Add(ClassName, FExpression,rltCaseSensitive);
if EdInspect.Items.IndexOf(FExpression) = -1
then EdInspect.Items.Insert(0, FExpression);
Opts := [defFullTypeInfo];
if menuClassType.Checked then
include(Opts, defClassAutoCast);
if not DebugBoss.Evaluate(FExpression, FHumanReadable, FDBGInfo, Opts)
or not assigned(FDBGInfo) then
begin
FreeAndNil(FDBGInfo);
Clear;
StatusBar1.SimpleText:=FExpression + ' : unavailable';
Exit;
end;
case FDBGInfo.Kind of
skClass: InspectClass();
skRecord: InspectRecord();
skVariant: InspectVariant();
skEnum: InspectEnum;
skSet: InspectSet;
skProcedure: InspectSimple;
skFunction: InspectSimple;
skSimple: InspectSimple();
skPointer: InspectPointer();
// skDecomposable: ;
end;
finally
FUpdateLock := False;
end;
if FUpdateNeeded then
UpdateData;
end;
{ TOIDBGGrid }