Fix dereferencing for the mutt_hcache_close calls. Use hcache_t* instead of evil...

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 7c7517a..4fe6eb4 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -442,8 +442,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
   menu->tag = mutt_tag_attach;
   menu->data = idx;
 
-  if (option (OPTMBOXPANE))
-    buffy_check (0);
   while (loop) {
 #ifdef USE_NNTP
     unset_option (OPTNEWS);     /* for any case */
@@ -688,8 +686,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         else
 #endif
           mutt_expand_path (fname, sizeof (fname));
-        if (mx_get_magic (fname) != M_IMAP)
-          if (mx_get_magic (fname) != M_POP)
+        if (mx_get_magic (fname) != M_IMAP && mx_get_magic (fname) != M_POP) {
 #ifdef USE_NNTP
             if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
 #endif
@@ -698,6 +695,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                 mutt_perror (fname);
                 break;
               }
+        }
 
         menu->redraw = REDRAW_FULL;
 
@@ -711,7 +709,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           mx_close_mailbox (ctx, NULL);
           p_delete(&ctx);
           mutt_error _("No messages in that folder.");
-
           break;
         }
 
@@ -750,7 +747,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
               update_idx (menu, idx, idxlen++);
             else {
               mutt_error _("Unable to attach!");
-
               p_delete(&idx[idxlen]);
             }
           }