From e241b44689d9792e99d4a9307fc054d5f386c405 Mon Sep 17 00:00:00 2001 From: Jelmer van der Linde Date: Sat, 28 Jan 2017 19:44:00 +0100 Subject: [PATCH] Partially fix an issue where the move/copy popup would not show up when the main window was hidden, but the popup was called from a single message window. --- Nostalgy4MailApp/SearchPopup.m | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Nostalgy4MailApp/SearchPopup.m b/Nostalgy4MailApp/SearchPopup.m index c57f8c8..0fd387e 100644 --- a/Nostalgy4MailApp/SearchPopup.m +++ b/Nostalgy4MailApp/SearchPopup.m @@ -52,7 +52,6 @@ - (void)addMailboxesToDictionary:(NSMutableDictionary *)dict for (MFMailbox *mailbox in account.mailboxes) { if (mailbox.isValid && mailbox.isVisible) { NSString *name = fullPathNameForMailbox(mailbox); - // NSLog(@"N4M: Adding mailbox %@: %@", name, mailbox); [dict setObject:mailbox forKey:name]; } } @@ -60,11 +59,21 @@ - (void)addMailboxesToDictionary:(NSMutableDictionary *)dict } MessageViewer *viewer = [[mailApp messageViewers] firstObject]; - [dict setObject:viewer.junkMailbox forKey:viewer.junkMailbox.name]; - [dict setObject:viewer.sentMailbox forKey:viewer.sentMailbox.name]; - [dict setObject:viewer.draftsMailbox forKey:viewer.draftsMailbox.name]; - [dict setObject:viewer.outbox forKey:viewer.outbox.name]; - [dict setObject:viewer.inbox forKey:viewer.inbox.name]; + + if (viewer.junkMailbox != nil) + [dict setObject:viewer.junkMailbox forKey:viewer.junkMailbox.name]; + + if (viewer.sentMailbox != nil) + [dict setObject:viewer.sentMailbox forKey:viewer.sentMailbox.name]; + + if (viewer.draftsMailbox != nil) + [dict setObject:viewer.draftsMailbox forKey:viewer.draftsMailbox.name]; + + if (viewer.outbox != nil) + [dict setObject:viewer.outbox forKey:viewer.outbox.name]; + + if (viewer.inbox != nil) + [dict setObject:viewer.inbox forKey:viewer.inbox.name]; } - (id) init