SMTP-Client: first evaluate the recipients, so we have them set properly on bail...

[citadel.git] / citadel / modules / smtp / serv_smtpeventclient.c

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index fbcf67c2ced45a0c8c56f8ed27efe74831800b8c..abacc906f0d3466d67459905de99ec6701a3df7c 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -587,9 +587,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
        if (KeepMsgText) Msg->msgtext = MsgText;
        else             Msg->msgtext = NewStrBufDup(MsgText);
 
-       if (((!MyQItem->HaveRelay ||
-             (MyQItem->URL != NULL)) &&
-            smtp_resolve_recipients(Msg)))
+       if (smtp_resolve_recipients(Msg) &&
+           (!MyQItem->HaveRelay ||
+            (MyQItem->URL != NULL)))
        {
                safestrncpy(
                        ((CitContext *)Msg->IO.CitContext)->cs_host,