diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-07-17 21:02:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-07-17 21:02:26 +0100 |
| commit | 7e7c8faa34ceeed66d508dd8c5cb6983b4c2d7a5 (patch) | |
| tree | 63ade2cc3d4be3094f2b5d4e279df40f8715c53b | |
| parent | 7c78ebce45484716e6e02292d7d107e2b15cdbcb (diff) | |
| parent | f6a9f6b4ad139f46426ff308669b49a8dc25592e (diff) | |
| download | rtmux-7e7c8faa34ceeed66d508dd8c5cb6983b4c2d7a5.tar.gz rtmux-7e7c8faa34ceeed66d508dd8c5cb6983b4c2d7a5.tar.bz2 rtmux-7e7c8faa34ceeed66d508dd8c5cb6983b4c2d7a5.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-if-shell.c | 5 | ||||
| -rw-r--r-- | server-client.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index a992602c..2befbc0c 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -121,7 +121,10 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item) cdata->cmd_else = NULL; memcpy(&cdata->mouse, m, sizeof cdata->mouse); - cdata->client = item->client; + if (!args_has(args, 'b')) + cdata->client = item->client; + else + cdata->client = c; if (cdata->client != NULL) cdata->client->references++; diff --git a/server-client.c b/server-client.c index d801cfe5..f44631c9 100644 --- a/server-client.c +++ b/server-client.c @@ -1224,6 +1224,7 @@ server_client_handle_key(struct client *c, struct key_event *event) return (0); } } + server_client_clear_overlay(c); } /* |