Make the cmd_find_* functions more obvious when looking for a client,

rather than having it inside other functions. Should be no change to the
way targets are resolved just yet.

1 files changed, 5 insertions, 4 deletions

diff --git a/cmd-queue.c b/cmd-queue.c
index 804216fa..6607fc04 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -216,11 +216,12 @@ cmdq_fire_command(struct cmdq_item *item)
 		name = cmd->entry->name;
 		if (cmd_find_valid_state(&item->state.tflag))
 			fsp = &item->state.tflag;
-		else {
-			if (cmd_find_current(&fs, item, CMD_FIND_QUIET) != 0)
-				goto out;
+		else if (cmd_find_valid_state(&item->shared->current))
+			fsp = &item->shared->current;
+		else if (cmd_find_from_client(&fs, item->client) == 0)
 			fsp = &fs;
-		}
+		else
+			goto out;
 		hooks_insert(fsp->s->hooks, item, fsp, "after-%s", name);
 	}