From 28fdf9f57ab30f38baa4f49eba3941bf74ba6742 Mon Sep 17 00:00:00 2001 From: michael starke Date: Thu, 12 Dec 2013 02:14:15 +0100 Subject: [PATCH] Fixed merging issue --- MacPass/MPEntryViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index a1a9fbda..9dbdfdef 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -344,7 +344,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell"; #pragma mark Filtering - (void)showFilter:(id)sender { - if([self _showsFilterBar]) { + if(self.isDisplayingFilterbar) { [self.filterSearchField selectText:self]; } @@ -418,7 +418,7 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell"; - (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector { - if (commandSelector == @selector(insertNewline:)) + if(commandSelector == @selector(insertNewline:)) { self.filter = [self.filterSearchField stringValue]; }