Fix classic pgp decrypt_part() hard redraw on error.

Ensure the hard redraw is set even if the decryption fails.  The agent
prompt still may have appeared.

Since we don't need to set environment variables afterwards, directly
check the OPTUSEGPGAGENT option for the post-check.

1 files changed, 4 insertions, 3 deletions

diff --git a/pgp.c b/pgp.c
index 7ed90c36..245617f0 100644
--- a/pgp.c
+++ b/pgp.c
@@ -998,7 +998,11 @@ BODY *pgp_decrypt_part (BODY *a, STATE *s, FILE *fpout, BODY *p)
   }
 
   safe_fclose (&pgpout);
+
   rv = mutt_wait_filter (thepid);
+  if (option (OPTUSEGPGAGENT))
+    mutt_need_hard_redraw ();
+
   mutt_unlink (mutt_b2s (pgptmpfile));
 
   fflush (pgperr);
@@ -1023,9 +1027,6 @@ BODY *pgp_decrypt_part (BODY *a, STATE *s, FILE *fpout, BODY *p)
   fflush (fpout);
   rewind (fpout);
 
-  if (pgp_use_gpg_agent())
-    mutt_need_hard_redraw ();
-
   if (fgetc (fpout) == EOF)
   {
     mutt_error _("Decryption failed");