Fix adding / removing mailboxes

Do not duplicate mailboxes in the AllMailboxes list. Reset Context when
the last mailbox goes away.

diff --git a/mailbox.c b/mailbox.c
index c2ea6b1d20461b2df91b5ab52ca91226d207735f..05167bdb1105375759f80880964b7924e6159e00 100644 (file)
--- a/mailbox.c
+++ b/mailbox.c
@@ -108,6 +108,8 @@ void mailbox_free(struct Mailbox **m)
   FREE(&(*m)->desc);
   if ((*m)->mdata && (*m)->free_mdata)
     (*m)->free_mdata(&(*m)->mdata);
+  if (Context && Context->mailbox && Context->mailbox == *m)
+    Context = NULL;
   FREE(m);
 }
 
@@ -563,14 +565,10 @@ int mutt_parse_mailboxes(struct Buffer *buf, struct Buffer *s,
           old_m->flags = MB_NORMAL;
           mutt_sb_notify_mailbox(old_m, true);
           struct MailboxNode *mn = mutt_mem_calloc(1, sizeof(*mn));
-          mn->m = m;
+          mn->m = old_m;
           STAILQ_INSERT_TAIL(&AllMailboxes, mn, entries);
         }
-        else
-        {
-          // mutt_error("mailbox exists: %s", m->path);
-          mailbox_free(&m);
-        }
+        mailbox_free(&m);
         continue;
       }
     }