X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=7b0b95ac8037ab35277080e5648726aa91d15581;hp=8feba181bc0996b4c04cc61d1c5710bb71357227;hb=3f35b8874fb10587ce43e2853a1ef95573222015;hpb=38dacbf03fe1a0daa9ce426caaef5582b90006b2

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 8feba18..7b0b95a 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -107,19 +107,18 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
     }
   }
 
-  if (optional)
-    m_strformat(dest, destlen, ifstr, _mutt_fmt_pgp_command, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elstr, _mutt_fmt_pgp_command, data, 0);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                _mutt_fmt_pgp_command, data, 0);
 
-  return (src);
+  return src;
 }
 
 static void
 mutt_pgp_command(char *d, ssize_t dlen, struct pgp_command_context *cctx,
                  const char *fmt)
 {
-  m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_pgp_command, cctx, 0);
+    m_strformat(d, dlen, 0, fmt, _mutt_fmt_pgp_command, cctx, 0);
 }
 
 /*