circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/1848/head
Thomas Adam 2019-07-17 21:02:26 +01:00
parent 7c78ebce45 f6a9f6b4ad
commit 7e7c8faa34
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-if-shell.c
View File

@ -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++;

1
server-client.c
View File

@ -1224,6 +1224,7 @@ server_client_handle_key(struct client *c, struct key_event *event)
return (0);
}
}
server_client_clear_overlay(c);
}
/*