From c026b52cc53fddd52d71674620849698aabe57c4 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 10 Feb 2013 12:28:36 +0000 Subject: [PATCH] IDE: menu designer: prevent crash when all menu items were deleted, bug #23870 git-svn-id: trunk@40241 - --- designer/designermenu.pp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/designer/designermenu.pp b/designer/designermenu.pp index 68fbe19aaf..56e61e6838 100644 --- a/designer/designermenu.pp +++ b/designer/designermenu.pp @@ -960,9 +960,12 @@ begin Item := FindDesignerMenuItem(MenuItem); if Item <> nil then begin - DeleteItem(Item); - SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root); - RealignDesigner; + if DeleteItem(Item) = 2 then + (Owner as TForm).Close + else begin + SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root); + RealignDesigner; + end; end; end; inherited;