diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-04-13 06:25:59 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-04-13 06:25:59 +0100 |
| commit | c2048c5c65aea99f2b79290b87635cb1d90863a6 (patch) | |
| tree | 8aafdf588893ccdd65c8db53f5188f83f020675b /cmd-queue.c | |
| parent | 46cbbe3d4566885b8ad4235598389936f63c2c01 (diff) | |
| parent | bedf2bd4372c60a525c22e6309f329cfd0bd07bc (diff) | |
| download | rtmux-c2048c5c65aea99f2b79290b87635cb1d90863a6.tar.gz rtmux-c2048c5c65aea99f2b79290b87635cb1d90863a6.tar.bz2 rtmux-c2048c5c65aea99f2b79290b87635cb1d90863a6.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 05f439f5..54163919 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -276,7 +276,7 @@ cmdq_merge_formats(struct cmdq_item *item, struct format_tree *ft) const struct cmd_entry *entry; if (item->cmd != NULL) { - entry = cmd_get_entry (item->cmd); + entry = cmd_get_entry(item->cmd); format_add(ft, "command", "%s", entry->name); } if (item->state->formats != NULL) @@ -862,7 +862,7 @@ cmdq_error(struct cmdq_item *item, const char *fmt, ...) c->retval = 1; } else { *msg = toupper((u_char) *msg); - status_message_set(c, -1, 1, "%s", msg); + status_message_set(c, -1, 1, 0, "%s", msg); } free(msg); |