imap: Fix args and human_args parameters to imap_command_finished event

They were being set too early when they didn't yet exist.

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 0b7d2d3cda5c72d0175d40d19cadc36c08bda4ec..344eb252228c6cc98666001bb150a6bb748f0d65 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -731,10 +731,12 @@ bool client_read_args(struct client_command_context *cmd, unsigned int count,
                str = t_str_new(256);
                imap_write_args(str, *args_r);
                cmd->args = p_strdup(cmd->pool, str_c(str));
+               event_add_str(cmd->event, "args", cmd->args);
 
                str_truncate(str, 0);
                imap_write_args_for_human(str, *args_r);
                cmd->human_args = p_strdup(cmd->pool, str_c(str));
+               event_add_str(cmd->event, "human_args", cmd->human_args);
 
                cmd->client->input_lock = NULL;
                return TRUE;
@@ -895,10 +897,6 @@ void client_command_init_finished(struct client_command_context *cmd)
 {
        event_add_str(cmd->event, "tag", cmd->tag);
        event_add_str(cmd->event, "name", t_str_ucase(cmd->name));
-       if (cmd->args != NULL)
-               event_add_str(cmd->event, "args", cmd->args);
-       if (cmd->human_args != NULL)
-               event_add_str(cmd->event, "human_args", cmd->human_args);
 }
 
 static struct client_command_context *