From c8ecbf38ab09d00920e97bd9363e16a1ebed0fa7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 21 Apr 2017 22:23:24 +0000
Subject: Log error properly when no current state, and some other minor
 tweaks.

---
 cmd-queue.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd-queue.c')

diff --git a/cmd-queue.c b/cmd-queue.c
index a7a29b58..99ec6055 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -203,14 +203,14 @@ cmdq_fire_command(struct cmdq_item *item)
 	flags = !!(cmd->flags & CMD_CONTROL);
 	cmdq_guard(item, "begin", flags);
 
+	if (item->client == NULL)
+		item->client = cmd_find_client(item, NULL, 1);
+
 	if (cmd_prepare_state(cmd, item) != 0) {
 		retval = CMD_RETURN_ERROR;
 		goto out;
 	}
 
-	if (item->client == NULL)
-		item->client = cmd_find_client(item, NULL, 1);
-
 	retval = cmd->entry->exec(cmd, item);
 	if (retval == CMD_RETURN_ERROR)
 		goto out;
-- 
cgit