From 8cd3c93f3520fef19de4137f34bb5de763ca6ef4 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 25 Jan 2018 13:06:30 +0000 Subject: [PATCH] --- 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: branches/fixes_3_0@38034 - --- packages/chm/src/chmfiftimain.pas | 1 + packages/chm/src/chmreader.pas | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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;