Partially fix an issue where the move/copy popup would not show up wh…

…en the main window was hidden, but the popup was called from a single message window.
jelmervdl · Jan 28, 2017 · e241b44 · e241b44
1 parent 31e7c0c
commit e241b44
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/Nostalgy4MailApp/SearchPopup.m b/Nostalgy4MailApp/SearchPopup.m
@@ -52,19 +52,28 @@ - (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];
                 }
             }
         }
     }
 
     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