diff options
author | nicm <nicm> | 2017-04-21 22:23:24 +0000 |
---|---|---|
committer | nicm <nicm> | 2017-04-21 22:23:24 +0000 |
commit | c8ecbf38ab09d00920e97bd9363e16a1ebed0fa7 (patch) | |
tree | 73320de7f20ff71c652ea97e7aeb4b97da215253 /cmd-queue.c | |
parent | 194a121ef68d5af557e3e158d1aa6a8f013cd2ac (diff) | |
download | rtmux-c8ecbf38ab09d00920e97bd9363e16a1ebed0fa7.tar.gz rtmux-c8ecbf38ab09d00920e97bd9363e16a1ebed0fa7.tar.bz2 rtmux-c8ecbf38ab09d00920e97bd9363e16a1ebed0fa7.zip |
Log error properly when no current state, and some other minor tweaks.
Diffstat (limited to 'cmd-queue.c')
-rw-r--r-- | cmd-queue.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |