diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 12:04:09 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 12:04:09 +0100 |
| commit | 07c679b52d18f198a60da2bd5b9b743bac55680f (patch) | |
| tree | 6e6db084991d889e61e0a5d53db1f8740a666ce6 /cmd-queue.c | |
| parent | 2e4e521629a8e23502551cfe13ea327e1971d1e2 (diff) | |
| parent | b4c633cc40cd3d5963e24e6d560bc2c7f6553000 (diff) | |
| download | rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.tar.gz rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.tar.bz2 rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.zip | |
Merge branch 'master' into 2.6-rc
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index db802339..ec65bd80 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -241,7 +241,7 @@ cmdq_fire_command(struct cmdq_item *item) fsp = &item->target; else if (cmd_find_valid_state(&item->shared->current)) fsp = &item->shared->current; - else if (cmd_find_from_client(&fs, item->client) == 0) + else if (cmd_find_from_client(&fs, item->client, 0) == 0) fsp = &fs; else goto out; |