From: Steven! Ragnarök <steven@nuclearsandwich.com>
Date: Tue, 18 Oct 2016 20:45:26 +0000 (-0400)
Subject: forgotten-attachment: Fix checking logic.
X-Git-Tag: neomutt-20161028~14^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dd1ace6ca6dbaa918e9f10fdbc22212dc5cc50c;p=neomutt

forgotten-attachment: Fix checking logic.

Don't bother searching the email for attachment keywords, if:
- The feature is disabled
- There's an attachment
---

diff --git a/send.c b/send.c
index 7f5d1371a..55f626eda 100644
--- a/send.c
+++ b/send.c
@@ -1895,8 +1895,9 @@ main_loop:
   }
 #endif
 
-  if (mutt_search_attach_keyword (msg->content->filename) &&
+  if (quadoption(OPT_ATTACH) != MUTT_NO &&
          !msg->content->next &&
+         mutt_search_attach_keyword (msg->content->filename) &&
          query_quadoption (OPT_ATTACH, _("No attachments, cancel sending?")) != MUTT_NO)
   {
     /* if the abort is automatic, print an error message */