circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-11-12 20:01:10 +00:00
commit 7177eeaa42
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-run-shell.c
View File

@ -59,13 +59,21 @@ cmd_run_shell_print(struct job *job, const char *msg)
{ {
struct cmd_run_shell_data *cdata = job->data; struct cmd_run_shell_data *cdata = job->data;
struct window_pane *wp = NULL; struct window_pane *wp = NULL;
struct cmd_find_state fs;
if (cdata->wp_id != -1) if (cdata->wp_id != -1)
wp = window_pane_find_by_id(cdata->wp_id); wp = window_pane_find_by_id(cdata->wp_id);
if (cdata->item != NULL && wp == NULL) { if (wp == NULL) {
if (cdata->item != NULL) {
cmdq_print(cdata->item, "%s", msg); cmdq_print(cdata->item, "%s", msg);
return; return;
} }
if (cmd_find_current (&fs, NULL, CMD_FIND_QUIET) != 0)
return;
wp = fs.wp;
if (wp == NULL)
return;
}
if (window_pane_set_mode(wp, &window_copy_mode) == 0) if (window_pane_set_mode(wp, &window_copy_mode) == 0)
window_copy_init_for_output(wp); window_copy_init_for_output(wp);

4
server.c
View File

@ -196,8 +196,10 @@ server_loop(void)
do { do {
items = cmdq_next(NULL); items = cmdq_next(NULL);
TAILQ_FOREACH(c, &clients, entry) TAILQ_FOREACH(c, &clients, entry) {
if (c->flags & CLIENT_IDENTIFIED)
items += cmdq_next(c); items += cmdq_next(c);
}
} while (items != 0); } while (items != 0);
server_client_loop(); server_client_loop();