X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgp.c;h=a19c490758a7af50d1c785e8003ed623c31e0afb;hp=7fdd5e9f4d29b834f055a9e889e90b4fc9013177;hb=28c2fbe53cf73c57fd80bf332b4f4674ee09198b;hpb=841a368ddea400022328f35dd8c7a3eb6f543892

diff --git a/pgp.c b/pgp.c
index 7fdd5e9..a19c490 100644
--- a/pgp.c
+++ b/pgp.c
@@ -22,6 +22,9 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
+#include "handler.h"
 #include "mutt_curses.h"
 #include "pgp.h"
 #include "mime.h"
@@ -362,14 +365,13 @@ 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 !=NULL)
-        if (! ftell(pgpout)) {
-          mutt_error _("Could not decrypt PGP message");
-          goto out;
+        /* treat empty result as sign of failure */
+        if (!(pgpout && ftell (pgpout))) {
+            mutt_error _("Could not decrypt PGP message");
+            goto out;
         }
+      }
 
       /*
        * Now, copy cleartext to the screen.  NOTE - we expect that PGP