diff options
| author | nicm <nicm> | 2017-04-21 20:26:34 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2017-04-21 20:26:34 +0000 |
| commit | efaf4c16cf9fafa940dfe16ec48ca4ff68082b47 (patch) | |
| tree | b4ac4aa4f81ae7f5df53d7360cb2d7aef8cfd988 /cmd-queue.c | |
| parent | 2ad09ab5af530ceb5fbbbe53ea99a73ef9ddbe49 (diff) | |
| download | rtmux-efaf4c16cf9fafa940dfe16ec48ca4ff68082b47.tar.gz rtmux-efaf4c16cf9fafa940dfe16ec48ca4ff68082b47.tar.bz2 rtmux-efaf4c16cf9fafa940dfe16ec48ca4ff68082b47.zip | |
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.
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 9 |
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); } |