From 3b5518415e57798370c2343c66cac9fbde17a382 Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Thu, 19 Apr 2007 09:25:22 +0000
Subject: [PATCH] menu designer: open the designer for the correct menu (bug
 #7443), from Paul

git-svn-id: trunk@10973 -
---
 designer/menueditorform.pas | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/designer/menueditorform.pas b/designer/menueditorform.pas
index 57410004af..d3372ad966 100644
--- a/designer/menueditorform.pas
+++ b/designer/menueditorform.pas
@@ -191,9 +191,6 @@ begin
   height:=220;
   position:=poDesktopCenter;
   
-  fMenu:=aMenu;
-  fDesigner:=FindRootDesigner(fMenu) as TComponentEditorDesigner;
-
   Cmp2:=TScrollBox.Create(self);
   with Cmp2 do
   begin
@@ -243,8 +240,7 @@ begin
   
   Panel:=Cmp;
 
-  UpdateListOfMenus;
-  CreateDesignerMenu;
+  SetMenu(aMenu);
 
   GlobalDesignHook.AddHandlerPersistentDeleting(@OnPersistentDeleting);
   GlobalDesignHook.AddHandlerPersistentAdded(@OnPersistentAdded);
@@ -283,11 +279,15 @@ end;
 
 procedure TMainMenuEditorForm.SetMenu(NewMenu: TMenu);
 begin
-  if NewMenu=fMenu then exit;
-  DesignerMainMenu.Free;
-  DesignerMainMenu:=nil;
-  fMenu:=NewMenu;
-  CreateDesignerMenu;
+  if NewMenu <> fMenu then
+  begin
+    DesignerMainMenu.Free;
+    DesignerMainMenu := nil;
+    fMenu := NewMenu;
+    fDesigner := FindRootDesigner(fMenu) as TComponentEditorDesigner;
+    UpdateListOfMenus;
+    CreateDesignerMenu;
+  end;
 end;
 
 procedure TMainMenuEditorForm.Paint;