paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 22:58:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

MenuEditor: Fixed access violation on adding from menu templates. Issue #32766. Patch by Serge Anvarov

Browse Source 
git-svn-id: branches/fixes_1_8@56733 -
This commit is contained in:
mattias 2017-12-14 18:08:55 +00:00
parent d203634b0a
commit a929af8444
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
designer/menueditor.pp
View File

@ -1386,7 +1386,7 @@ begin
if (FSelectedMenuItem <> nil) and (FSelectedMenuItem.Parent.Parent = nil) then
begin
HideFakes;
newItem:=InsertMenuTemplateDlg;
newItem:=InsertMenuTemplateDlg(FMenu);
if (newItem <> nil) then
begin
FMenu.Items.Add(newItem);

6
designer/menutemplates.pas
View File

@ -142,7 +142,7 @@ type
function SavedTemplatesExist: boolean;
function GetSavedTemplatesCount: integer;
function InsertMenuTemplateDlg: TMenuItem;
function InsertMenuTemplateDlg(ParentMenuForInsert: TMenu): TMenuItem;
function DeleteMenuTemplateDlg: boolean;
function GetCfgPath: string;
procedure InitMenuBaseSizes;
@ -239,11 +239,11 @@ begin
end;
end;
}
function InsertMenuTemplateDlg: TMenuItem;
function InsertMenuTemplateDlg(ParentMenuForInsert: TMenu): TMenuItem;
var
dlg: TMenuTemplateDialog;
begin
dlg:=TMenuTemplateDialog.CreateWithMode(nil, dmInsert);
dlg:=TMenuTemplateDialog.CreateWithMode(ParentMenuForInsert, dmInsert);
try
if (dlg.ShowModal = mrOK) then
Result:=dlg.MenuToInsert