--- Merging r37714 into '.':

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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@38034 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 2 insertions, 1 deletions

diff --git a/packages/chm/src/chmfiftimain.pas b/packages/chm/src/chmfiftimain.pas
index 895a24924c..7e6575b364 100644
--- a/packages/chm/src/chmfiftimain.pas
+++ b/packages/chm/src/chmfiftimain.pas
@@ -392,6 +392,7 @@ destructor TChmSearchWriter.Destroy;
 
 begin
  freeandnil(FActiveLeafNode);
+ inherited;
 end;
 
 
diff --git a/packages/chm/src/chmreader.pas b/packages/chm/src/chmreader.pas
index c4fc08e09a..2e5b184501 100644
--- a/packages/chm/src/chmreader.pas
+++ b/packages/chm/src/chmreader.pas
@@ -1641,7 +1641,7 @@ begin
   end;
   if not Result then begin
     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;
   end;
 end;