Fix parent_hdr usage in mutt_attach_reply(). (see #3728)

If the selected attachments are not messages and no (common) parent is
found, parent_hdr is set to the passed in hdr.  In that case, parent
will still be NULL, but parent_hdr and parent_fp will be set.

Change the test to parent_hdr being NULL, not parent, to check for
this case.

diff --git a/recvcmd.c b/recvcmd.c
index 869f6b498873ac7034602f2c52499131c109cda8..5d0e31e7bb307ecc0e38e36e417f3bb618e63c4b 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -840,7 +840,7 @@ void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachCtx *actx,
   tmphdr->env = mutt_new_envelope();
 
   if (attach_reply_envelope_defaults(
-          tmphdr->env, actx, parent ? parent_hdr : (cur ? cur->hdr : NULL), flags) == -1)
+          tmphdr->env, actx, parent_hdr ? parent_hdr : (cur ? cur->hdr : NULL), flags) == -1)
   {
     mutt_free_header(&tmphdr);
     return;
@@ -854,7 +854,7 @@ void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachCtx *actx,
     return;
   }
 
-  if (!parent)
+  if (!parent_hdr)
   {
     if (cur)
       attach_include_reply(fp, tmpfp, cur->hdr, flags);
@@ -926,6 +926,6 @@ void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachCtx *actx,
   safe_fclose(&tmpfp);
 
   if (ci_send_message(flags, tmphdr, tmpbody, NULL,
-                      parent ? parent_hdr : (cur ? cur->hdr : NULL)) == 0)
+                      parent_hdr ? parent_hdr : (cur ? cur->hdr : NULL)) == 0)
     mutt_set_flag(Context, hdr, MUTT_REPLIED, 1);
 }