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

IDE: define variable LastProj to make code shorter.

Browse Source 
git-svn-id: trunk@64148 -
This commit is contained in:
juha 2020-11-19 22:12:46 +00:00
parent 0681ea5adc
commit 2f371ac685
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/main.pp
View File

@ -2312,7 +2312,7 @@ var
CmdLineFiles: TStrings;
i: Integer;
OpenFlags: TOpenFlags;
AFilename: String;
AFilename, LastProj: String;
PkgOpenFlags: TPkgOpenFlags;
begin
{$IFDEF IDE_DEBUG}
@ -2338,22 +2338,23 @@ begin
end;
end;
LastProj:=EnvironmentOptions.LastSavedProjectFile;
// try loading last project if lazarus didn't fail last time
{debugln(['TMainIDE.SetupStartProject ProjectLoaded=',ProjectLoaded,
' SkipAutoLoadingLastProject=',SkipAutoLoadingLastProject,
' EnvironmentOptions.OpenLastProjectAtStart=',EnvironmentOptions.OpenLastProjectAtStart,
' EnvironmentOptions.LastSavedProjectFile="',EnvironmentOptions.LastSavedProjectFile,'"',
' LastProj="',LastProj,'"',
' RestoreProjectClosed=',RestoreProjectClosed,
' FileExistsCached(EnvironmentOptions.LastSavedProjectFile)=',FileExistsCached(EnvironmentOptions.LastSavedProjectFile)
' FileExistsCached(LastProj)=',FileExistsCached(LastProj)
]);}
if (not ProjectLoaded)
and (not SkipAutoLoadingLastProject)
and (EnvironmentOptions.OpenLastProjectAtStart)
and (EnvironmentOptions.LastSavedProjectFile<>'')
and (LastProj<>'')
and ((EnvironmentOptions.MultipleInstances=mioAlwaysStartNew)
or (not LazIDEInstances.ProjectIsOpenInAnotherInstance(EnvironmentOptions.LastSavedProjectFile)))
and (EnvironmentOptions.LastSavedProjectFile<>RestoreProjectClosed)
and (FileExistsCached(EnvironmentOptions.LastSavedProjectFile))
or (not LazIDEInstances.ProjectIsOpenInAnotherInstance(LastProj)))
and (LastProj<>RestoreProjectClosed)
and (FileExistsCached(LastProj))
then begin
if (not IDEProtocolOpts.LastProjectLoadingCrashed)
or AskIfLoadLastFailingProject then begin
@ -2362,8 +2363,7 @@ begin
IDEProtocolOpts.LastProjectLoadingCrashed := True;
IDEProtocolOpts.Save;
// try loading the project
ProjectLoaded:=
(DoOpenProjectFile(EnvironmentOptions.LastSavedProjectFile,[])=mrOk);
ProjectLoaded:=DoOpenProjectFile(LastProj,[])=mrOk;
// protocol that the IDE was able to open the project without crashing
IDEProtocolOpts.LastProjectLoadingCrashed := false;
IDEProtocolOpts.Save;
@ -2379,9 +2379,8 @@ begin
Include(PkgOpenFlags,pofMultiOpen)
else
Exclude(PkgOpenFlags,pofMultiOpen);
if PkgBoss.DoOpenPackageFile(AFilename,PkgOpenFlags,true)=mrAbort then begin
if PkgBoss.DoOpenPackageFile(AFilename,PkgOpenFlags,true)=mrAbort then
break;
end;
end;
end else
begin
@ -2393,8 +2392,8 @@ begin
if (not ProjectLoaded) then
begin
if EnvironmentOptions.OpenLastProjectAtStart
and (EnvironmentOptions.LastSavedProjectFile=RestoreProjectClosed) then begin
if EnvironmentOptions.OpenLastProjectAtStart and (LastProj=RestoreProjectClosed) then
begin
// IDE was closed without a project => restore that state
end else begin
// create new project