Trust the compiler to do short-circuit evaluation.

[citadel.git] / citadel / messages.c

diff --git a/citadel/messages.c b/citadel/messages.c
index 62aae6ade118d236fed6eaf45ccef57cc639d482..3f295f9cbb5a65a163fff64bad5534f2ead3bb6f 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -571,7 +571,7 @@ int read_message(CtdlIPC *ipc,
 
        /* Set the reply-to address to an Internet e-mail address if possible
         */
-       if (message->email != NULL) if (!IsEmptyStr(message->email)) {
+       if ((message->email != NULL) && (!IsEmptyStr(message->email))) {
                if (!IsEmptyStr(message->author)) {
                        snprintf(reply_to, sizeof reply_to, "%s <%s>", message->author, message->email);
                }