From c74254f171486fd3ee94405129b0d0729d961b3b Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Mon, 27 Aug 2018 12:13:15 +0200 Subject: [PATCH] Cleaner code --- MacPass/MPTreeDelegate.m | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/MacPass/MPTreeDelegate.m b/MacPass/MPTreeDelegate.m index 2fd92275..fe55acb1 100644 --- a/MacPass/MPTreeDelegate.m +++ b/MacPass/MPTreeDelegate.m @@ -94,15 +94,12 @@ panel.contentViewController = pickFieldViewController; panel.title = NSLocalizedString(@"PICKFIELD_WINDOW_TITLE", @"Window displayed to the user to pick an amout of characters"); [panel center]; - if(NSModalResponseOK == [NSApp runModalForWindow:panel]) { - /* add appropriate key press commands? or let the pick-char view-controller handel this? */ - return pickFieldViewController.pickedValue; - } - return @""; + NSModalResponse response = [NSApp runModalForWindow:panel]; + [panel orderOut:nil]; + return (response == NSModalResponseOK) ? pickFieldViewController.pickedValue : @""; } - (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForEntry:(KPKEntry *)entry field:(NSString *)field options:(NSString *)options { - NSString *value = [[entry valueForAttributeWithKey:field] kpk_finalValueForEntry:entry]; if(value.length == 0) { return @""; // error while retrieving source value @@ -122,10 +119,8 @@ panel.contentViewController = pickCharViewController; panel.title = NSLocalizedString(@"PICKCHAR_WINDOW_TITLE", @"Window displayed to the user to pick an amout of characters"); [panel center]; - if(NSModalResponseOK == [NSApp runModalForWindow:panel]) { - /* add appropriate key press comamnds? or let the pick-char view-controller handel this? */ - return pickCharViewController.pickedValue; - } - return @""; + NSModalResponse response = [NSApp runModalForWindow:panel]; + [panel orderOut:nil]; + return (response == NSModalResponseOK) ? pickCharViewController.pickedValue : @""; } @end