X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=b4dbd3a6634d676aa64a565fe7abcf00c9136d1a;hp=10803c44a7acceb4f2f88745cc4a840f4ebcd42e;hb=9afa66139f6099fc06d9866d4283191e43b0e17a;hpb=28b09c881c2b1175298a3b94e09106f77a94eb88

diff --git a/send.c b/send.c
index 10803c4..b4dbd3a 100644
--- a/send.c
+++ b/send.c
@@ -1428,9 +1428,10 @@ int ci_send_message (int flags, /* send mode */
          query_quadoption (OPT_FORWEDIT,
                            _("Edit forwarded message?")) == M_YES)) {
       /* If the this isn't a text message, look for a mailcap edit command */
-      if (mutt_needs_mailcap (msg->content))
-        mutt_edit_attachment (msg->content);
-      else if (!Editor || str_cmp ("builtin", Editor) == 0)
+      if (mutt_needs_mailcap (msg->content)) {
+        if (!mutt_edit_attachment (msg->content))
+          goto cleanup;
+      } else if (!Editor || str_cmp ("builtin", Editor) == 0)
         mutt_builtin_editor (msg->content->filename, msg, cur);
       else if (option (OPTEDITHDRS)) {
         mutt_env_to_local (msg->env);