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

--- Merging r37714 into '.':

Browse Source 
U    packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r37714 into '.':
 U   .
--- Merging r37716 into '.':
U    packages/chm/src/chmfiftimain.pas
--- Recording mergeinfo for merge of r37716 into '.':
 G   .

# revisions: 37714,37716

git-svn-id: branches/fixes_3_0@38034 -
This commit is contained in:
marco 2018-01-25 13:06:30 +00:00
parent 297bf2fbfa
commit 8cd3c93f35
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/chm/src/chmfiftimain.pas
View File

@ -392,6 +392,7 @@ destructor TChmSearchWriter.Destroy;
begin begin
freeandnil(FActiveLeafNode); freeandnil(FActiveLeafNode);
inherited;
end; end;

2
packages/chm/src/chmreader.pas
View File

@ -1641,7 +1641,7 @@ begin
end; end;
if not Result then begin if not Result then begin
AFileName := ExtractFilePath(FileName[0])+AFileName; AFileName := ExtractFilePath(FileName[0])+AFileName;
if FileExists(AFileName) and (ExtractFileExt(AFileName) = '.chm') then OpenNewFile(AFileName); if FileExists(AFileName) and (LowerCase(ExtractFileExt(AFileName)) = '.chm') then OpenNewFile(AFileName);
Result := True; Result := True;
end; end;
end; end;