virtual: virtual-mail - Free up mails in virtual_mail_close if we are freeing up

Makes next change easier

diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c
index 9a2eda994b8b3ff3e580b9bb4be3375c6845537b..e482cec82497d6b9bece807a0700e08f9519e7ff 100644 (file)
--- a/src/plugins/virtual/virtual-mail.c
+++ b/src/plugins/virtual/virtual-mail.c
@@ -62,8 +62,13 @@ static void virtual_mail_close(struct mail *mail)
        for (i = 0; i < count; i++) {
                struct mail_private *p = (struct mail_private *)mails[i];
 
-               p->v.close(mails[i]);
+               if (vmail->imail.freeing)
+                       mail_free(&mails[i]);
+               else
+                       p->v.close(mails[i]);
        }
+       if (vmail->imail.freeing)
+               array_free(&vmail->backend_mails);
        index_mail_close(mail);
 }
 
@@ -73,10 +78,8 @@ static void virtual_mail_free(struct mail *mail)
        struct mail **mails;
        unsigned int i, count;
 
-       mails = array_get_modifiable(&vmail->backend_mails, &count);
-       for (i = 0; i < count; i++)
-               mail_free(&mails[i]);
-       array_free(&vmail->backend_mails);
+       vmail->imail.freeing = TRUE;
+       virtual_mail_close(mail);
        mail->transaction->mail_ref_count--;
 
        mailbox_header_lookup_unref(&vmail->wanted_headers);