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

SynEdit: Apply locks before destructions. No need to update any internal values (e.g. caret pos) any more. Fix crash, when wrap and multi-caret active.

Browse Source
This commit is contained in:
Martin 2025-03-15 11:58:11 +01:00
parent 3d0e837d14
commit 098985e106
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/synedit/synedit.pp
View File

@ -923,6 +923,7 @@ type
ATextDrawer: TheTextDrawer): TSynGutter; virtual;
public
constructor Create(AOwner: TComponent); override;
procedure BeforeDestruction; override;
destructor Destroy; override;
procedure AfterLoadFromFile;
@ -2683,18 +2684,31 @@ begin
end;
end;
procedure TCustomSynEdit.BeforeDestruction;
begin
inherited BeforeDestruction;
{$IFDEF SynCheckPaintLock}
if (FPaintLockOwnerCnt > 0) then begin
debugln(['TCustomSynEdit.Destroy: Paintlock=', FPaintLock, ' FInvalidateRect=', dbgs(FInvalidateRect)]);
DumpStack;
end;
{$ENDIF}
// block all events during destruction
inc(FPaintLock);
FMarkupManager.IncPaintLock;
FFoldedLinesView.Lock; //DecPaintLock triggers ScanRanges, and folds must wait
FTrimmedLinesView.Lock; // Lock before caret
FBlockSelection.Lock;
FCaret.Lock;
end;
destructor TCustomSynEdit.Destroy;
var
i: integer;
p: TList;
begin
Destroying;
{$IFDEF SynCheckPaintLock}
if (FPaintLock > 0) then begin
debugln(['TCustomSynEdit.Destroy: Paintlock=', FPaintLock, ' FInvalidateRect=', dbgs(FInvalidateRect)]);
DumpStack;
end;
{$ENDIF}
inc(FPaintLock); // block all events during destruction
Application.RemoveOnIdleHandler(@IdleScanRanges);
SurrenderPrimarySelection;
Highlighter := nil;