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

lazbuild: stop writing output when terminating

Browse Source 
git-svn-id: trunk@47669 -
This commit is contained in:
mattias 2015-02-09 21:22:56 +00:00
parent 2ce759e3c2
commit 064b7e9add
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/exttools.pas
View File

@ -42,7 +42,7 @@ uses
LCLIntf, LCLProc, Forms, Dialogs, FileUtil, AvgLvlTree,
// IDEIntf
IDEExternToolIntf, BaseIDEIntf, MacroIntf, IDEMsgIntf, IDEDialogs,
CompOptsIntf, PackageIntf, LazIDEIntf,
PackageIntf, LazIDEIntf,
// IDE
IDECmdLine, TransferMacros, LazarusIDEStrConsts;
@ -87,6 +87,7 @@ type
TLazExtToolConsole = class(TComponent)
private
FTerminating: boolean;
fViews: TFPList; // list of TLazExtToolConsoleView
function GetViews(Index: integer): TLazExtToolConsoleView;
public
@ -97,6 +98,7 @@ type
function FindUnfinishedView: TLazExtToolConsoleView;
property Views[Index: integer]: TLazExtToolConsoleView read GetViews;
function Count: integer; inline;
property Terminating: boolean read FTerminating write FTerminating;
end;
var
@ -301,6 +303,8 @@ end;
procedure TLazExtToolConsoleView.OnNewOutput(Sender: TObject;
FirstNewMsgLine: integer);
begin
if (ExtToolConsole<>nil) and ExtToolConsole.Terminating then
exit;
while fWrittenLineCount<Tool.WorkerOutput.Count do begin
debugln(Tool.WorkerOutput[fWrittenLineCount]);
inc(fWrittenLineCount);
@ -1350,10 +1354,14 @@ var
i: Integer;
begin
// terminate all current tools
if ExtToolConsole<>nil then
ExtToolConsole.Terminating:=true;
for i:=Count-1 downto 0 do begin
if i>=Count then continue;
Terminate(Items[i] as TExternalTool);
end;
if ExtToolConsole<>nil then
ExtToolConsole.Terminating:=false;
end;
procedure TExternalTools.Clear;