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

IDE: package options: fixed restoring modified on restore

Browse Source 
git-svn-id: trunk@31328 -
This commit is contained in:
mattias 2011-06-22 07:48:36 +00:00
parent 22711aa9bc
commit 47a3a0845c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packager/packagedefs.pas
View File

@ -2555,9 +2555,8 @@ begin
if FOptionsBackup=nil then if FOptionsBackup=nil then
FOptionsBackup:=TLazPackage.Create; FOptionsBackup:=TLazPackage.Create;
FOptionsBackup.AssignOptions(Self); FOptionsBackup.AssignOptions(Self);
if lpfModified in FFlags then
FOptionsBackup.FFlags:=FOptionsBackup.FFlags-[lpfModified]+[lpfModified]*FFlags; FOptionsBackup.FFlags:=FOptionsBackup.FFlags-[lpfModified]+[lpfModified]*FFlags;
FOptionsBackup.CompilerOptions.Modified:=CompilerOptions.Modified FOptionsBackup.CompilerOptions.Modified:=CompilerOptions.Modified;
end; end;
procedure TLazPackage.RestoreOptions; procedure TLazPackage.RestoreOptions;
@ -2565,7 +2564,7 @@ begin
if FOptionsBackup=nil then exit; if FOptionsBackup=nil then exit;
AssignOptions(FOptionsBackup); AssignOptions(FOptionsBackup);
FFlags:=FFlags-[lpfModified]+[lpfModified]*FOptionsBackup.FFlags; FFlags:=FFlags-[lpfModified]+[lpfModified]*FOptionsBackup.FFlags;
CompilerOptions.Modified:=FOptionsBackup.CompilerOptions.Modified CompilerOptions.Modified:=FOptionsBackup.CompilerOptions.Modified;
end; end;
procedure TLazPackage.BeginUpdate; procedure TLazPackage.BeginUpdate;

2
packager/pkgmanager.pas
View File

@ -577,7 +577,7 @@ procedure TPkgManager.OnAfterWritePackage(Sender: TObject; Restore: boolean);
var var
APackage: TLazPackage absolute Sender; APackage: TLazPackage absolute Sender;
begin begin
//debugln(['TPkgManager.OnAfterWritePackage ',DbgSName(APackage),' Restore=',Restore]); debugln(['TPkgManager.OnAfterWritePackage ',DbgSName(APackage),' Restore=',Restore]);
if Restore then if Restore then
APackage.RestoreOptions; APackage.RestoreOptions;
end; end;