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

IDE: do not save LPI on project reload. Issue #36813

Browse Source 
git-svn-id: trunk@62780 -
This commit is contained in:
ondrej 2020-03-20 13:21:53 +00:00
parent df1458b6f9
commit 765094ef99
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/main.pp
View File

@ -6539,8 +6539,9 @@ begin
if not DoResetToolStatus([rfInteractive, rfSuccessOnTrigger]) then exit; if not DoResetToolStatus([rfInteractive, rfSuccessOnTrigger]) then exit;
// save old project // save old project
if AskSaveProject(lisDoYouStillWantToOpenAnotherProject, if not (ofRevert in Flags)
lisDiscardChangesAndOpenProject)<>mrOk then exit; and (AskSaveProject(lisDoYouStillWantToOpenAnotherProject, lisDiscardChangesAndOpenProject)<>mrOk) then
exit;
Result:=DoCloseProject; Result:=DoCloseProject;
if Result=mrAbort then exit; if Result=mrAbort then exit;
@ -8566,7 +8567,7 @@ begin
mtConfirmation, [mrYes, lisReopenProject, mtConfirmation, [mrYes, lisReopenProject,
mrIgnore], '') = mrYes mrIgnore], '') = mrYes
then begin then begin
DoOpenProjectFile(Project1.ProjectInfoFile,[]); DoOpenProjectFile(Project1.ProjectInfoFile,[ofRevert]);
end else begin end else begin
Project1.IgnoreProjectInfoFileOnDisk; Project1.IgnoreProjectInfoFileOnDisk;
end; end;

2
ide/sourcefilemanager.pas
View File

@ -7872,7 +7872,7 @@ begin
if Project1=nil then exit(mrOk); if Project1=nil then exit(mrOk);
if not SomethingOfProjectIsModified then exit(mrOk); if not SomethingOfProjectIsModified then exit(mrOk);
DataModified:=Project1.SomeDataModified(false); DataModified:=Project1.SomeDataModified(false) or Project1.HasProjectInfoFileChangedOnDisk;
SrcModified:=SourceEditorManager.SomethingModified(false); SrcModified:=SourceEditorManager.SomethingModified(false);
if Project1.IsVirtual if Project1.IsVirtual