paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-22 22:09:43 +01: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: trunk@56596 -
This commit is contained in:
michl 2017-12-03 21:24:08 +00:00
parent 6cb727545e
commit 15bf13b6de
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

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

6
designer/menutemplates.pas
View File

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