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

* Fix bug #37445, find resource file in subdir

Browse Source 
git-svn-id: trunk@46502 -
This commit is contained in:
michael 2020-08-20 08:32:50 +00:00
parent ca5e2ee16a
commit 460dc49d68
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/pastojs/src/pas2jsfilecache.pp
View File

@ -1988,11 +1988,18 @@ var
function SearchInDir(Dir: string; var Filename: string): boolean; function SearchInDir(Dir: string; var Filename: string): boolean;
// search in Dir for pp, pas, p times given case, lower case, upper case // search in Dir for pp, pas, p times given case, lower case, upper case
var
CurFile : String;
begin begin
Dir:=IncludeTrailingPathDelimiter(Dir); Dir:=IncludeTrailingPathDelimiter(Dir);
if IndexOfFile(SearchedDirs,Dir)>=0 then exit(false); if IndexOfFile(SearchedDirs,Dir)>=0 then exit(false);
SearchedDirs.Add(Dir); SearchedDirs.Add(Dir);
if SearchLowUpCase(Filename) then exit(true); CurFile:=Dir+Filename;
if SearchLowUpCase(CurFile) then
begin
FileName:=CurFile;
exit(true);
end;
Result:=false; Result:=false;
end; end;