diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-06-01 12:01:20 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-06-01 12:01:20 +0100 |
| commit | 91e40de2da5124b1593c1c25462b8c9a36b8ebfd (patch) | |
| tree | baae9e8fbba21c26851ca4f451105ac194a1d688 /cmd-queue.c | |
| parent | 5ef790a6c41f5b78d2e757612b75cb9142b9173f (diff) | |
| parent | a54a88edd6fd893d4370feb9f9136e13096b891c (diff) | |
| download | rtmux-91e40de2da5124b1593c1c25462b8c9a36b8ebfd.tar.gz rtmux-91e40de2da5124b1593c1c25462b8c9a36b8ebfd.tar.bz2 rtmux-91e40de2da5124b1593c1c25462b8c9a36b8ebfd.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index b0c70428..693f7d90 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -780,7 +780,7 @@ cmdq_guard(struct cmdq_item *item, const char *guard, int flags) u_int number = item->number; if (c != NULL && (c->flags & CLIENT_CONTROL)) - file_print(c, "%%%s %ld %u %d\n", guard, t, number, flags); + control_write(c, "%%%s %ld %u %d", guard, t, number, flags); } /* Show message from command. */ @@ -807,7 +807,10 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...) msg = utf8_sanitize(tmp); free(tmp); } - file_print(c, "%s\n", msg); + if (c->flags & CLIENT_CONTROL) + control_write(c, "%s", msg); + else + file_print(c, "%s\n", msg); } else { wp = server_client_get_pane(c); wme = TAILQ_FIRST(&wp->modes); @@ -849,7 +852,7 @@ cmdq_error(struct cmdq_item *item, const char *fmt, ...) free(tmp); } if (c->flags & CLIENT_CONTROL) - file_print(c, "%s\n", msg); + control_write(c, "%s", msg); else file_error(c, "%s\n", msg); c->retval = 1; |