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

fixed error handling reading pkg links

Browse Source 
git-svn-id: trunk@8235 -
This commit is contained in:
mattias 2005-11-28 21:45:28 +00:00
parent a4f6996c21
commit b509adcfde
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/main.pp
View File

@ -6180,7 +6180,6 @@ function TMainIDE.DoOpenFileAndJumpToPos(const AFilename: string;
var var
ActiveUnitInfo, OldActiveUnitInfo: TUnitInfo; ActiveUnitInfo, OldActiveUnitInfo: TUnitInfo;
ActiveSrcEdit, OldActiveSrcEdit: TSourceEditor; ActiveSrcEdit, OldActiveSrcEdit: TSourceEditor;
NewSource: TCodeBuffer;
begin begin
GetCurrentUnit(OldActiveSrcEdit,OldActiveUnitInfo); GetCurrentUnit(OldActiveSrcEdit,OldActiveUnitInfo);
Result:=DoOpenEditorFile(AFilename, PageIndex, Flags); Result:=DoOpenEditorFile(AFilename, PageIndex, Flags);

4
packager/packagelinks.pas
View File

@ -400,10 +400,11 @@ begin
DebugLn('WARNING: suspicious pkg link file found (name): ',CurFilename); DebugLn('WARNING: suspicious pkg link file found (name): ',CurFilename);
continue; continue;
end; end;
NewFilename:='';
sl:=TStringList.Create; sl:=TStringList.Create;
try try
sl.LoadFromFile(CurFilename); sl.LoadFromFile(CurFilename);
if sl.Count<0 then begin if sl.Count<=0 then begin
DebugLn('WARNING: suspicious pkg link file found (content): ',CurFilename); DebugLn('WARNING: suspicious pkg link file found (content): ',CurFilename);
continue; continue;
end; end;
@ -414,6 +415,7 @@ begin
end; end;
end; end;
sl.Free; sl.Free;
if NewFilename='' then continue;
NewPkgLink:=TPackageLink.Create; NewPkgLink:=TPackageLink.Create;
NewPkgLink.Origin:=ploGlobal; NewPkgLink.Origin:=ploGlobal;