forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow building and prevent RT errors when build with Laz 1.8

This commit is contained in:
Basile Burg 2018-01-10 21:29:16 +01:00
parent 66886987de
commit 95d98216df
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ce_d2syn.pas
View File

@ -166,10 +166,13 @@ end;
procedure TSynD2SynRange.copyFrom(source: TSynD2SynRange); procedure TSynD2SynRange.copyFrom(source: TSynD2SynRange);
begin begin
if assigned(source) then
begin
nestedCommentsCount := source.nestedCommentsCount; nestedCommentsCount := source.nestedCommentsCount;
namedRegionCount := source.namedRegionCount; namedRegionCount := source.namedRegionCount;
rangeKinds := source.rangeKinds; rangeKinds := source.rangeKinds;
rString := source.rString; rString := source.rString;
end;
end; end;
constructor TSynD2Syn.create(aOwner: TComponent); constructor TSynD2Syn.create(aOwner: TComponent);
@ -442,6 +445,9 @@ begin
end; end;
end; end;
if not assigned(fCurrRange) then
fCurrRange := TSynD2SynRange.Create(nil);
// line comments / region beg-end // line comments / region beg-end
if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkAsm]) if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkAsm])
then if readDelim(reader, fTokStop, '//') then then if readDelim(reader, fTokStop, '//') then

2
src/ce_d2synpresets.pas
View File

@ -562,7 +562,7 @@ begin
fPropEd.PropertyEditorHook.AddHandlerModified(@propEdModified); fPropEd.PropertyEditorHook.AddHandlerModified(@propEdModified);
// //
fList.ItemIndex := 0; fList.ItemIndex := 0;
lstBoxSelChange(nil); //lstBoxSelChange(nil);
EntitiesConnector.addObserver(self); EntitiesConnector.addObserver(self);
end; end;

6
src/ce_main.pas
View File

@ -18,9 +18,9 @@ uses
ce_dfmt, ce_lcldragdrop, ce_projgroup, ce_projutils, ce_stringrange, ce_dastworx, ce_dfmt, ce_lcldragdrop, ce_projgroup, ce_projutils, ce_stringrange, ce_dastworx,
ce_halstead, ce_profileviewer, ce_semver; ce_halstead, ce_profileviewer, ce_semver;
{$IF lcl_fullversion<>1060400} //{$IF lcl_fullversion<>1060400}
{$STOP 'LCL version is not compatible. 1.6.4 is needed for latest Coedit release'} // {$STOP 'LCL version is not compatible. 1.6.4 is needed for latest Coedit release'}
{$ENDIF} //{$ENDIF}
type type