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

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

Browse Source 
git-svn-id: branches/fixes_2_0@62942 -
This commit is contained in:
juha 2020-04-11 12:42:05 +00:00
parent 07af721275
commit 09b3daa082
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packager/packageeditor.pas
View File

@ -307,6 +307,8 @@ type
procedure ViewPkgTodosClick(Sender: TObject); procedure ViewPkgTodosClick(Sender: TObject);
private private
FIdleConnected: boolean; FIdleConnected: boolean;
FCompiling: boolean;
FCompileDesignTimePkg: boolean;
FLazPackage: TLazPackage; FLazPackage: TLazPackage;
FNextSelectedPart: TPENodeData;// select this file/dependency on next update FNextSelectedPart: TPENodeData;// select this file/dependency on next update
FFilesNode: TTreeNode; FFilesNode: TTreeNode;
@ -351,7 +353,6 @@ type
function CanBeAddedToProject: boolean; function CanBeAddedToProject: boolean;
protected protected
fFlags: TPEFlags; fFlags: TPEFlags;
FCompileDesignTimePkg: boolean;
procedure SetLazPackage(const AValue: TLazPackage); override; procedure SetLazPackage(const AValue: TLazPackage); override;
property IdleConnected: boolean read FIdleConnected write SetIdleConnected; property IdleConnected: boolean read FIdleConnected write SetIdleConnected;
public public
@ -1243,8 +1244,14 @@ begin
end; end;
if CanClose and not MainIDE.IDEIsClosing then if CanClose and not MainIDE.IDEIsClosing then
begin begin
EnvironmentOptions.LastOpenPackages.Remove(LazPackage.Filename); if FCompiling then begin
MainIDE.SaveEnvironment; DebugLn(['TPackageEditorForm.CanCloseEditor: ', Caption, ' compiling, do not close.']);
CanClose:=false;
end
else begin
EnvironmentOptions.LastOpenPackages.Remove(LazPackage.Filename);
MainIDE.SaveEnvironment;
end;
end; end;
end; end;
//debugln(['TPackageEditorForm.PackageEditorFormCloseQuery CanClose=',CanClose,' ',Caption]); //debugln(['TPackageEditorForm.PackageEditorFormCloseQuery CanClose=',CanClose,' ',Caption]);
@ -3201,7 +3208,9 @@ begin
end; end;
end; end;
CompileBitBtn.Enabled:=False; CompileBitBtn.Enabled:=False;
FCompiling:=True;
PackageEditors.CompilePackage(LazPackage,CompileClean,CompileRequired); PackageEditors.CompilePackage(LazPackage,CompileClean,CompileRequired);
FCompiling:=False;
UpdateTitle; UpdateTitle;
UpdateButtons; UpdateButtons;
UpdateStatusBar; UpdateStatusBar;