* Merging revisions r46502 from trunk:

    ------------------------------------------------------------------------
    r46502 | michael | 2020-08-20 10:32:50 +0200 (Thu, 20 Aug 2020) | 1 line
    
    * Fix bug #37445, find resource file in subdir
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46651 -

packages/pastojs/src/pas2jsfilecache.pp

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