paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 19:52:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Menu designer: Prevent AV, if Menu designer is opened and more then one TPopupMenu are edited and selected in Object inspector.

Browse Source 
git-svn-id: trunk@53851 -
This commit is contained in:
michl 2017-01-03 09:48:20 +00:00
parent ffc1493b4a
commit b8e6ac48a0
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
designer/menudesignerbase.pas
View File

@ -241,20 +241,13 @@ end;
destructor TMenuDesignerBase.Destroy; destructor TMenuDesignerBase.Destroy;
begin begin
if (FShadowMenu <> nil) then begin FreeShadowMenu;
FShadowMenu.Parent:=nil;
FreeAndNil(FShadowMenu);
end;
FreeAndNil(FShortcuts); FreeAndNil(FShortcuts);
inherited Destroy; inherited Destroy;
end; end;
procedure TMenuDesignerBase.FreeShadowMenu; procedure TMenuDesignerBase.FreeShadowMenu;
begin begin
if FShadowMenu <> nil then
FShadowMenu.SelectedMenuItem:=nil;
if Assigned(GlobalDesignHook) then
GlobalDesignHook.RemoveAllHandlersForObject(FShadowMenu);
FreeAndNil(FShadowMenu); FreeAndNil(FShadowMenu);
end; end;

4
designer/menueditor.pp
View File

@ -1894,6 +1894,10 @@ end;
destructor TShadowMenu.Destroy; destructor TShadowMenu.Destroy;
begin begin
Parent := nil;
GlobalDesignHook.RemoveHandlerRefreshPropertyValues(@OnDesignerRefreshPropertyValues);
GlobalDesignHook.RemoveHandlerModified(@OnDesignerModified);
GlobalDesignHook.RemoveHandlerObjectPropertyChanged(@OnObjectPropertyChanged);
inherited Destroy; inherited Destroy;
end; end;

3
designer/menueditorform.pas
View File

@ -568,8 +568,7 @@ begin
end end
else if (aMenu <> FEditedMenu) then else if (aMenu <> FEditedMenu) then
begin begin
FDesigner.ShadowMenu.Free; FDesigner.FreeShadowMenu;
FDesigner.ShadowMenu := Nil;
FEditedMenu := aMenu; FEditedMenu := aMenu;
selection := aMenuItem; selection := aMenuItem;
end; end;