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

IDE: Move "if not FLoadParts ..." test outside of TProject.LoadFromLPI.

Browse Source 
git-svn-id: trunk@45761 -
This commit is contained in:
juha 2014-07-03 11:50:56 +00:00
parent a9154fe760
commit 399317698e
1 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/project.pp
View File

@ -2821,12 +2821,9 @@ begin
end;
procedure TProject.LoadFromLPI;
var
Path: String;
const
Path = 'ProjectOptions/';
begin
Path:='ProjectOptions/';
if not FLoadParts then
begin
if (FFileVersion=0) and (FXMLConfig.GetValue(Path+'Units/Count',0)=0) then
if IDEMessageDialog(lisStrangeLpiFile,
Format(lisTheFileDoesNotLookLikeALpiFile, [ProjectInfoFile]),
@ -2889,7 +2886,6 @@ begin
// call hooks to read their info (e.g. DebugBoss)
if Assigned(OnLoadProjectInfo) then
OnLoadProjectInfo(Self, FXMLConfig, false);
end;
end;
procedure TProject.LoadFromSession;
@ -2975,6 +2971,7 @@ begin
fCurStorePathDelim:=StorePathDelim;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TProject.ReadProject C reading values');{$ENDIF}
FFileVersion:= FXMLConfig.GetValue('ProjectOptions/Version/Value',0);
if not FLoadParts then
LoadFromLPI;
// load MacroValues and compiler options
ClearBuildModes;