From a2def8129ee7c94595294cddf98092e4e48901fc Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Sat, 19 Apr 2014 12:21:13 +0200 Subject: [PATCH] Fixed #183 menu item validation for AddGroup/AddEntry now just check for a selected group and does not require a selected item anymore --- MacPass/MPDocument.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index 3527bcdd..d9cb489e 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -580,9 +580,14 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey switch([MPActionHelper typeForAction:[anItem action]]) { case MPActionAddGroup: valid &= (nil != self.selectedGroup); - // fall-through + valid &= (self.trash != self.selectedGroup); + valid &= ![self isItemTrashed:self.selectedGroup]; + break; case MPActionAddEntry: - // fall-through + valid &= (nil != self.selectedGroup); + valid &= (self.trash != self.selectedGroup); + valid &= ![self isItemTrashed:self.selectedGroup]; + break; case MPActionDelete: valid &= (nil != self.selectedItem); valid &= (self.trash != self.selectedItem);