paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-07 02:17:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

ChmMaker: Fix a memory leak. Issue #28250, patch from wp.

Browse Source 
git-svn-id: trunk@49282 -
This commit is contained in:
juha 2015-06-06 11:19:47 +00:00
parent d5cad8c9f8
commit f5d76b4807
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/chmmaker/chmsitemapeditor.pas
View File

@ -85,7 +85,7 @@ type
procedure TSitemapEditForm.CancelBtnClick(Sender: TObject);
begin
//
end;
procedure TSitemapEditForm.DeleteBtnClick(Sender: TObject);
@ -288,9 +288,8 @@ begin
BackgroundClrBtn.ButtonColor := TColor(ChmSiteMap.BackgroundColor);
FolderViewCheck.Checked := ChmSiteMap.UseFolderImages;
FontEdit.Text := ChmSiteMap.Font;
//ChmSiteMap.Free;
ChmSiteMap.Free;
end;
function TSitemapEditForm.Execute(AStream: TStream; SiteType: TSiteMapType;

25
tools/chmmaker/unit1.pas
View File

@ -71,6 +71,7 @@ type
ARect: TRect; {%H-}State: TOwnerDrawState);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure IndexEditAcceptFileName(Sender: TObject; var Value: String);
procedure IndexEditBtnClick(Sender: TObject);
procedure ProjCloseItemClick(Sender: TObject);
@ -332,6 +333,11 @@ begin
CloseProject;
end;
procedure TCHMForm.FormDestroy(Sender: TObject);
begin
CloseProject;
end;
procedure TCHMForm.IndexEditAcceptFileName(Sender: TObject; var Value: String);
begin
Modified := True;
@ -360,7 +366,11 @@ begin
Stream := TFileStream.Create(FileName, fmCreate or fmOpenReadWrite);
end;
if SitemapEditForm.Execute(Stream, stIndex, FileListBox.Items) then IndexEdit.FileName := FileName;
try
if SitemapEditForm.Execute(Stream, stIndex, FileListBox.Items) then IndexEdit.FileName := FileName;
finally
Stream.Free;
end;
end;
procedure TCHMForm.ProjCloseItemClick(Sender: TObject);
@ -442,12 +452,13 @@ begin
Stream := TFileStream.Create(FileName, fmCreate or fmOpenReadWrite);
end;
BDir := ExtractFilePath(Project.FileName);
FileName := ExtractRelativepath(BDir, FileName);
if SitemapEditForm.Execute(Stream, stTOC, FileListBox.Items) then TOCEdit.FileName := FileName;
try
BDir := ExtractFilePath(Project.FileName);
FileName := ExtractRelativepath(BDir, FileName);
if SitemapEditForm.Execute(Stream, stTOC, FileListBox.Items) then TOCEdit.FileName := FileName;
finally
Stream.Free;
end;
end;
function TCHMForm.GetModified: Boolean;