mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-28 21:20:46 +02:00
designer: fix crashes in menu designer (bug #0014050)
git-svn-id: trunk@20742 -
This commit is contained in:
parent
81253b1a26
commit
8f5b5a247c
@ -1610,7 +1610,7 @@ begin
|
|||||||
temp_designermenuitem^.ParentMenu:=nil;
|
temp_designermenuitem^.ParentMenu:=nil;
|
||||||
temp_designermenuitem^.PrevItem:=DesignerMenuItem;
|
temp_designermenuitem^.PrevItem:=DesignerMenuItem;
|
||||||
if (DesignerMenuItem^.ParentMenu = nil) and (DesignerMenuItem^.PrevItem = nil) then
|
if (DesignerMenuItem^.ParentMenu = nil) and (DesignerMenuItem^.PrevItem = nil) then
|
||||||
Root:=DesignerMenuItem;
|
FRoot:=DesignerMenuItem;
|
||||||
DesignerMenuItem^.NextItem:=temp_designermenuitem;
|
DesignerMenuItem^.NextItem:=temp_designermenuitem;
|
||||||
if (DesignerMenuItem^.ParentMenu <> nil) then
|
if (DesignerMenuItem^.ParentMenu <> nil) then
|
||||||
DesignerMenuItem^.ParentMenu^.SubMenu:=DesignerMenuItem;
|
DesignerMenuItem^.ParentMenu^.SubMenu:=DesignerMenuItem;
|
||||||
@ -1649,7 +1649,7 @@ begin
|
|||||||
temp_designermenuitem^.ParentMenu:=DesignerMenuItem^.ParentMenu;
|
temp_designermenuitem^.ParentMenu:=DesignerMenuItem^.ParentMenu;
|
||||||
DesignerMenuItem^.ParentMenu:=nil;
|
DesignerMenuItem^.ParentMenu:=nil;
|
||||||
if (temp_designermenuitem^.ParentMenu = nil) and (temp_designermenuitem^.PrevItem = nil) then
|
if (temp_designermenuitem^.ParentMenu = nil) and (temp_designermenuitem^.PrevItem = nil) then
|
||||||
Root:=temp_designermenuitem;
|
FRoot:=temp_designermenuitem;
|
||||||
if (temp_designermenuitem^.ParentMenu <> nil) then
|
if (temp_designermenuitem^.ParentMenu <> nil) then
|
||||||
temp_designermenuitem^.ParentMenu^.SubMenu:=temp_designermenuitem;
|
temp_designermenuitem^.ParentMenu^.SubMenu:=temp_designermenuitem;
|
||||||
if (DesignerMenuItem^.NextItem <> nil) then
|
if (DesignerMenuItem^.NextItem <> nil) then
|
||||||
@ -1721,7 +1721,7 @@ begin
|
|||||||
if (temp_parentmenudesignermenuitem = nil) and (temp_previousdesignermenuitem = nil) then
|
if (temp_parentmenudesignermenuitem = nil) and (temp_previousdesignermenuitem = nil) then
|
||||||
begin
|
begin
|
||||||
temp_nextdesignermenuitem^.ParentMenu:=nil;
|
temp_nextdesignermenuitem^.ParentMenu:=nil;
|
||||||
Root:=temp_nextdesignermenuitem;
|
FRoot:=temp_nextdesignermenuitem;
|
||||||
end;
|
end;
|
||||||
if (temp_parentmenudesignermenuitem <> nil) then
|
if (temp_parentmenudesignermenuitem <> nil) then
|
||||||
begin
|
begin
|
||||||
|
Loading…
Reference in New Issue
Block a user