From 47a3a0845c862cbc6de3ffbd2079aa00ac81311b Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 22 Jun 2011 07:48:36 +0000 Subject: [PATCH] IDE: package options: fixed restoring modified on restore git-svn-id: trunk@31328 - --- packager/packagedefs.pas | 5 ++--- packager/pkgmanager.pas | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index b90d7fabd6..5b05ea6124 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -2555,9 +2555,8 @@ begin if FOptionsBackup=nil then FOptionsBackup:=TLazPackage.Create; FOptionsBackup.AssignOptions(Self); - if lpfModified in FFlags then FOptionsBackup.FFlags:=FOptionsBackup.FFlags-[lpfModified]+[lpfModified]*FFlags; - FOptionsBackup.CompilerOptions.Modified:=CompilerOptions.Modified + FOptionsBackup.CompilerOptions.Modified:=CompilerOptions.Modified; end; procedure TLazPackage.RestoreOptions; @@ -2565,7 +2564,7 @@ begin if FOptionsBackup=nil then exit; AssignOptions(FOptionsBackup); FFlags:=FFlags-[lpfModified]+[lpfModified]*FOptionsBackup.FFlags; - CompilerOptions.Modified:=FOptionsBackup.CompilerOptions.Modified + CompilerOptions.Modified:=FOptionsBackup.CompilerOptions.Modified; end; procedure TLazPackage.BeginUpdate; diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas index bd54fd513c..b097c7c03e 100644 --- a/packager/pkgmanager.pas +++ b/packager/pkgmanager.pas @@ -577,7 +577,7 @@ procedure TPkgManager.OnAfterWritePackage(Sender: TObject; Restore: boolean); var APackage: TLazPackage absolute Sender; begin - //debugln(['TPkgManager.OnAfterWritePackage ',DbgSName(APackage),' Restore=',Restore]); + debugln(['TPkgManager.OnAfterWritePackage ',DbgSName(APackage),' Restore=',Restore]); if Restore then APackage.RestoreOptions; end;