Move pgp failure check inside the if (invoke pgp) block. Should really

Close: 2032.

diff --git a/pgp.c b/pgp.c
index 564ecfc8284415a6c141b31a0d39f068bc3c367f..55f90ce94b95fd78f7c47bb3945d5d7f2b663d20 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -378,16 +378,17 @@ void pgp_application_pgp_handler (BODY *m, STATE *s)
            state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
          }
        }
-      }
-      
-      /* treat empty result as sign of failure */
-      if (!(pgpout && ftell(pgpout)))
-      {
-        mutt_error _("Could not decrypt PGP message");
-        pgp_void_passphrase ();
 
-        goto out;
+        /* treat empty result as sign of failure */
+        if (!(pgpout && ftell(pgpout)))
+        {
+          mutt_error _("Could not decrypt PGP message");
+          pgp_void_passphrase ();
+          
+          goto out;
+        }
       }
+      
       /*
        * Now, copy cleartext to the screen.  NOTE - we expect that PGP
        * outputs utf-8 cleartext.  This may not always be true, but it