From d9f18ec9b4671325bbbc8679dbac707718b129a0 Mon Sep 17 00:00:00 2001 From: gcasa Date: Sun, 25 Jan 2009 16:44:35 +0000 Subject: [PATCH] * Source/NSMenuView.m: Return from the trackWithEvent: method if the indexOfActionToExecute is -1. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27690 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSMenuView.m | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57732aa43..f9d1aa1d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-25 11:51-EST Gregory John Casamento + + * Source/NSMenuView.m: Return from the trackWithEvent: method + if the indexOfActionToExecute is -1. + 2009-01-25 Richard Frith-Macdonald * Source/GSWindowDecorationView.m: diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m index 7d7f291ec..6ed9091bc 100644 --- a/Source/NSMenuView.m +++ b/Source/NSMenuView.m @@ -1281,11 +1281,6 @@ static NSMapTable *viewInfo = 0; - (BOOL) _executeItemAtIndex: (int)indexOfActionToExecute removeSubmenu: (BOOL)subMenusNeedRemoving { - if (indexOfActionToExecute == -1) - { - return YES; - } - if (indexOfActionToExecute >= 0 && [_attachedMenu attachedMenu] != nil && [_attachedMenu attachedMenu] == [[_items_link objectAtIndex: indexOfActionToExecute] submenu]) @@ -1610,6 +1605,11 @@ static NSMapTable *viewInfo = 0; } } + if (indexOfActionToExecute == -1) + { + return YES; + } + if([self _executeItemAtIndex: indexOfActionToExecute removeSubmenu: subMenusNeedRemoving] == NO) {