let m_strformat accept NULL formats.

[apps/madmutt.git] / lib-ui / hdrline.c

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index cb5a5f4..879a67f 100644 (file)
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -706,12 +706,11 @@ static const char *hdr_format_str (char *dest,
     break;
   }
 
-  if (optional)
-    m_strformat(dest, destlen, ifstr, hdr_format_str, data, flags);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elstr, hdr_format_str, data, flags);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, optional ? ifstr: elstr,
+                hdr_format_str, data, flags);
 
-  return (src);
+  return src;
 #undef THREAD_NEW
 #undef THREAD_OLD
 }