Trust the compiler to do short-circuit evaluation.

[citadel.git] / citadel / commands.c

diff --git a/citadel/commands.c b/citadel/commands.c
index d46e7afbc141f7f3d9ebfef0a3b650fe18268a08..4b71f698e2fcba024445719baf145b82f0df6d3c 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -1645,7 +1645,7 @@ char keymenu(char *menuprompt, char *menustring) {
        choices = num_tokens(menustring, '|');
 
        if (menuprompt != NULL) do_prompt = 1;
-       if (menuprompt != NULL) if (IsEmptyStr(menuprompt)) do_prompt = 0;
+       if ((menuprompt != NULL) && (IsEmptyStr(menuprompt))) do_prompt = 0;
 
        while (1) {
                if (display_prompt) {