From 15bf13b6dea26c80d278b28d6d2ef55d004e2040 Mon Sep 17 00:00:00 2001
From: michl <michl@lazarus-ide.org>
Date: Sun, 3 Dec 2017 21:24:08 +0000
Subject: [PATCH] MenuEditor: Fixed access violation on adding from menu
 templates. Issue #32766. Patch by Serge Anvarov

git-svn-id: trunk@56596 -
---
 designer/menueditor.pp     | 2 +-
 designer/menutemplates.pas | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer/menueditor.pp b/designer/menueditor.pp
index 835e390a96..7dcdea7bf0 100644
--- a/designer/menueditor.pp
+++ b/designer/menueditor.pp
@@ -1375,7 +1375,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);
diff --git a/designer/menutemplates.pas b/designer/menutemplates.pas
index d329455c34..acbb6fbd06 100644
--- a/designer/menutemplates.pas
+++ b/designer/menutemplates.pas
@@ -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