From a3f455d6041788caa5dd804aebba109c3c395209 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 26 Jul 2023 11:58:09 +0200 Subject: [PATCH] IdeDebugger: Breakpoint dialog, fix crash due to unexpected handle creation in VTV --- .../idedebugger/breakpointgroupframe.pas | 7 +++++++ ide/packages/idedebugger/breakpointsdlg.pp | 17 ----------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ide/packages/idedebugger/breakpointgroupframe.pas b/ide/packages/idedebugger/breakpointgroupframe.pas index 76cf932a0a..7bad33bd4c 100644 --- a/ide/packages/idedebugger/breakpointgroupframe.pas +++ b/ide/packages/idedebugger/breakpointgroupframe.pas @@ -59,6 +59,7 @@ type protected procedure SetVisible(Value: Boolean); reintroduce; procedure VisibleChanged; override; + procedure CreateWnd; override; public constructor Create(TheOwner: TBreakPointsDlgBase; ATree: TDbgTreeView; ANode: PVirtualNode; ABrkGroup: TIDEBreakPointGroup; @@ -277,6 +278,12 @@ begin FTree.NodeHeight[FNode] := min(40, Max(15, ToolBar1.Height)); end; +procedure TBreakpointGroupFrame.CreateWnd; +begin + inherited CreateWnd; + FTree.NodeHeight[FNode] := min(40, Max(15, ToolBar1.Height)); +end; + constructor TBreakpointGroupFrame.Create(TheOwner: TBreakPointsDlgBase; ATree: TDbgTreeView; ANode: PVirtualNode; ABrkGroup: TIDEBreakPointGroup; AGroupKind: TBreakpointGroupFrameKind); diff --git a/ide/packages/idedebugger/breakpointsdlg.pp b/ide/packages/idedebugger/breakpointsdlg.pp index f2724eb01b..4b7e81693f 100644 --- a/ide/packages/idedebugger/breakpointsdlg.pp +++ b/ide/packages/idedebugger/breakpointsdlg.pp @@ -188,7 +188,6 @@ type procedure JumpToCurrentBreakPoint; procedure ShowProperties; protected - procedure CreateWnd; override; procedure AcceptGroupHeaderDrop(ADroppedGroupFrame: TBreakpointGroupFrame; ATargetNode: PVirtualNode); override; procedure DoBreakPointsChanged; override; procedure DoBeginUpdate; override; @@ -1627,22 +1626,6 @@ begin end; end; -procedure TBreakPointsDlg.CreateWnd; -var - i: Integer; -begin - inherited CreateWnd; - BeginUpdate; - try - ClearTree; - for i := 0 to DebugBoss.BreakPointGroups.Count - 1 do - GetNodeForBrkGroup(DebugBoss.BreakPointGroups[i]); - UpdateAll; - finally - EndUpdate; - end; -end; - procedure TBreakPointsDlg.DoBreakPointsChanged; var i: Integer;