paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-22 03:22:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Packager: Fix better the crash on closing package editor. Issue #36432.

Browse Source 
git-svn-id: trunk@62937 -
This commit is contained in:
juha 2020-04-11 09:43:03 +00:00
parent 18c6302e56
commit ec386ebc49
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packager/packageeditor.pas
View File

@ -317,6 +317,8 @@ type
procedure ViewPkgTodosClick(Sender: TObject);
private
FIdleConnected: boolean;
FCompiling: boolean;
FCompileDesignTimePkg: boolean;
FLazPackage: TLazPackage;
FNextSelectedPart: TPENodeData;// select this file/dependency on next update
FFilesNode: TTreeNode;
@ -367,7 +369,6 @@ type
procedure FileOptionsChange(Sender: TObject);
protected
fFlags: TPEFlags;
FCompileDesignTimePkg: boolean;
procedure SetLazPackage(const AValue: TLazPackage); override;
property IdleConnected: boolean read FIdleConnected write SetIdleConnected;
public
@ -3204,7 +3205,9 @@ begin
end;
end;
CompileBitBtn.Enabled:=False;
FCompiling:=True;
PackageEditors.CompilePackage(LazPackage,CompileClean,CompileRequired);
FCompiling:=False;
UpdateTitle;
UpdateButtons;
UpdateStatusBar;
@ -3402,8 +3405,8 @@ begin
begin
EnvironmentOptions.LastOpenPackages.Remove(LazPackage.Filename);
MainIDE.SaveEnvironment;
if not CompileBitBtn.Enabled then begin
DebugLn(['TPackageEditorForm.CanCloseEditor ', Caption, ' compiling, do not close.']);
if FCompiling then begin
DebugLn(['TPackageEditorForm.CanCloseEditor: ', Caption, ' compiling, do not close.']);
Result:=mrCancel;
end;
end;