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

lazbuild: do not set ExternalTools to nil before freeing

Browse Source 
git-svn-id: trunk@63074 -
This commit is contained in:
mattias 2020-04-25 12:12:05 +00:00
parent c31ca0dcaa
commit 3fb68e39a9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/buildmanager.pas
View File

@ -357,7 +357,7 @@ end;
destructor TBuildManager.Destroy; destructor TBuildManager.Destroy;
begin begin
FreeAndNil(ExternalTools); ExternalTools.Free; // sets ExternalTools to nil, do not use FreeAndNil!
GetBuildMacroValues:=nil; GetBuildMacroValues:=nil;
OnAppendCustomOption:=nil; OnAppendCustomOption:=nil;
@ -530,9 +530,13 @@ begin
end; end;
procedure TBuildManager.SetupExternalTools(aToolsClass: TExternalToolsClass); procedure TBuildManager.SetupExternalTools(aToolsClass: TExternalToolsClass);
var
Tools: TExternalTools;
begin begin
// setup the external tool queue // setup the external tool queue
ExternalTools:=aToolsClass.Create(Self); Tools:=aToolsClass.Create(Self);
if Tools<>ExternalTools then
raise Exception.Create('TBuildManager.SetupExternalTools ExternalTools='+DbgSName(ExternalTools));
EnvOptsChanged; EnvOptsChanged;
RegisterFPCParser; RegisterFPCParser;
RegisterPas2jsParser; RegisterPas2jsParser;

3
ide/lazbuild.lpi
View File

@ -43,6 +43,9 @@
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
</PublishOptions> </PublishOptions>
<RunParams>
<FormatVersion Value="2"/>
</RunParams>
<RequiredPackages Count="3"> <RequiredPackages Count="3">
<Item1> <Item1>
<PackageName Value="DebuggerIntf"/> <PackageName Value="DebuggerIntf"/>