diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-04-22 00:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-04-22 00:01:11 +0100 |
| commit | 21240c1a8f89a4615b5bd8fa129618fb45c1c3cb (patch) | |
| tree | 8af93abba6be1dd6f3eda69987361b614ae98223 /cmd-queue.c | |
| parent | fd13731049148d0205fa6ed1843041dad0573677 (diff) | |
| parent | c8ecbf38ab09d00920e97bd9363e16a1ebed0fa7 (diff) | |
| download | rtmux-21240c1a8f89a4615b5bd8fa129618fb45c1c3cb.tar.gz rtmux-21240c1a8f89a4615b5bd8fa129618fb45c1c3cb.tar.bz2 rtmux-21240c1a8f89a4615b5bd8fa129618fb45c1c3cb.zip | |
Merge branch 'obsd-master'
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; |