From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 25 Mar 2002 11:29:20 +0000 (+0000)
Subject: Fix #872, from Brendan Cully.
X-Git-Tag: mutt-1-5-1-rel~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e855575a166e4065add6859465550f9c01c7e207;p=mutt

Fix #872, from Brendan Cully.
---

diff --git a/hdrline.c b/hdrline.c
index 19621137..ffbaa880 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -419,8 +419,13 @@ hdr_format_str (char *dest,
       break;
 
     case 'E':
-      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-      snprintf (dest, destlen, fmt, mutt_messages_in_thread(ctx, hdr, 0));
+      if (!optional)
+      {
+	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+	snprintf (dest, destlen, fmt, mutt_messages_in_thread(ctx, hdr, 0));
+      }
+      else if (mutt_messages_in_thread(ctx, hdr, 0) <= 1)
+	optional = 0;
       break;
 
     case 'f':
diff --git a/muttlib.c b/muttlib.c
index 58637801..4c2da949 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -917,6 +917,7 @@ void mutt_FormatString (char *dest,		/* output buffer */
   char ifstring[SHORT_STRING], elsestring[SHORT_STRING];
   size_t wlen, count, len;
 
+  prefix[0] = '\0';
   destlen--; /* save room for the terminal \0 */
   wlen = (flags & M_FORMAT_ARROWCURSOR && option (OPTARROWCURSOR)) ? 3 : 0;