mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-12-10 17:01:59 +01:00
fixed memleak
git-svn-id: trunk@6587 -
This commit is contained in:
parent
c352ee72fe
commit
070a6c6939
@ -284,7 +284,6 @@ var
|
|||||||
begin
|
begin
|
||||||
try
|
try
|
||||||
XMLConfig:=TXMLConfig.Create(FFileName);
|
XMLConfig:=TXMLConfig.Create(FFileName);
|
||||||
Storage:=nil;
|
|
||||||
try
|
try
|
||||||
FileVersion:=XMLConfig.GetValue('HelpOptions/Version/Value',0);
|
FileVersion:=XMLConfig.GetValue('HelpOptions/Version/Value',0);
|
||||||
if (FileVersion<>0) and (FileVersion<HelpOptionsVersion) then
|
if (FileVersion<>0) and (FileVersion<HelpOptionsVersion) then
|
||||||
@ -292,17 +291,24 @@ begin
|
|||||||
|
|
||||||
if HelpViewers<>nil then begin
|
if HelpViewers<>nil then begin
|
||||||
Storage:=TXMLOptionsStorage.Create(XMLConfig,'Viewers');
|
Storage:=TXMLOptionsStorage.Create(XMLConfig,'Viewers');
|
||||||
HelpViewers.Load(Storage);
|
try
|
||||||
|
HelpViewers.Load(Storage);
|
||||||
|
finally
|
||||||
|
FreeAndNil(Storage);
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if HelpDatabases<>nil then begin
|
if HelpDatabases<>nil then begin
|
||||||
Storage:=TXMLOptionsStorage.Create(XMLConfig,'Databases');
|
Storage:=TXMLOptionsStorage.Create(XMLConfig,'Databases');
|
||||||
HelpDatabases.Load(Storage);
|
try
|
||||||
|
HelpDatabases.Load(Storage);
|
||||||
|
finally
|
||||||
|
FreeAndNil(Storage);
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
finally
|
finally
|
||||||
XMLConfig.Free;
|
XMLConfig.Free;
|
||||||
Storage.Free;
|
|
||||||
end;
|
end;
|
||||||
except
|
except
|
||||||
on E: Exception do begin
|
on E: Exception do begin
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user