Quellcode durchsuchen

--- 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 -

marco vor 7 Jahren
Ursprung
Commit
8cd3c93f35
2 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen
  1. 1 0
      packages/chm/src/chmfiftimain.pas
  2. 1 1
      packages/chm/src/chmreader.pas

+ 1 - 0
packages/chm/src/chmfiftimain.pas

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

+ 1 - 1
packages/chm/src/chmreader.pas

@@ -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;