From 8fe43ea1a07216f56f512ff360ee278ae02d571d Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 15 Apr 2006 14:56:19 +0000 Subject: [PATCH] improved TSynMultiSyn destruction git-svn-id: trunk@9128 - --- components/synedit/synhighlightermulti.pas | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/synedit/synhighlightermulti.pas b/components/synedit/synhighlightermulti.pas index 94693a95cf..5a2464d771 100644 --- a/components/synedit/synhighlightermulti.pas +++ b/components/synedit/synhighlightermulti.pas @@ -264,9 +264,9 @@ end; destructor TSynMultiSyn.Destroy; begin - fSchemes.Free; + FreeAndNil(fSchemes); ClearMarkers; - fMarkers.Free; + FreeAndNil(fMarkers); { unhook notification handlers } DefaultHighlighter := nil; inherited Destroy; @@ -516,9 +516,10 @@ begin then begin if DefaultHighlighter = aComp then DefaultHighlighter := nil; - for cScheme := 0 to Schemes.Count -1 do - if Schemes[ cScheme ].Highlighter = aComp then - Schemes[ cScheme ].Highlighter := nil; + if Schemes<>nil then + for cScheme := 0 to Schemes.Count -1 do + if Schemes[ cScheme ].Highlighter = aComp then + Schemes[ cScheme ].Highlighter := nil; end; end;