diff --git a/src/ce_d2syn.pas b/src/ce_d2syn.pas index ee0d3c48..edd6c1c9 100644 --- a/src/ce_d2syn.pas +++ b/src/ce_d2syn.pas @@ -166,10 +166,13 @@ end; procedure TSynD2SynRange.copyFrom(source: TSynD2SynRange); begin - nestedCommentsCount := source.nestedCommentsCount; - namedRegionCount := source.namedRegionCount; - rangeKinds := source.rangeKinds; - rString := source.rString; + if assigned(source) then + begin + nestedCommentsCount := source.nestedCommentsCount; + namedRegionCount := source.namedRegionCount; + rangeKinds := source.rangeKinds; + rString := source.rString; + end; end; constructor TSynD2Syn.create(aOwner: TComponent); @@ -442,6 +445,9 @@ begin end; end; + if not assigned(fCurrRange) then + fCurrRange := TSynD2SynRange.Create(nil); + // line comments / region beg-end if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkAsm]) then if readDelim(reader, fTokStop, '//') then diff --git a/src/ce_d2synpresets.pas b/src/ce_d2synpresets.pas index c06b8767..7b800e4c 100644 --- a/src/ce_d2synpresets.pas +++ b/src/ce_d2synpresets.pas @@ -562,7 +562,7 @@ begin fPropEd.PropertyEditorHook.AddHandlerModified(@propEdModified); // fList.ItemIndex := 0; - lstBoxSelChange(nil); + //lstBoxSelChange(nil); EntitiesConnector.addObserver(self); end; diff --git a/src/ce_main.pas b/src/ce_main.pas index 7f948487..4b64faea 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -18,9 +18,9 @@ uses ce_dfmt, ce_lcldragdrop, ce_projgroup, ce_projutils, ce_stringrange, ce_dastworx, ce_halstead, ce_profileviewer, ce_semver; -{$IF lcl_fullversion<>1060400} - {$STOP 'LCL version is not compatible. 1.6.4 is needed for latest Coedit release'} -{$ENDIF} +//{$IF lcl_fullversion<>1060400} +// {$STOP 'LCL version is not compatible. 1.6.4 is needed for latest Coedit release'} +//{$ENDIF} type