mirror of
https://github.com/tmux/tmux.git
synced 2024-12-25 02:48:47 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
7177eeaa42
@ -59,12 +59,20 @@ 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) {
|
||||||
cmdq_print(cdata->item, "%s", msg);
|
if (cdata->item != NULL) {
|
||||||
return;
|
cmdq_print(cdata->item, "%s", msg);
|
||||||
|
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)
|
||||||
|
6
server.c
6
server.c
@ -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) {
|
||||||
items += cmdq_next(c);
|
if (c->flags & CLIENT_IDENTIFIED)
|
||||||
|
items += cmdq_next(c);
|
||||||
|
}
|
||||||
} while (items != 0);
|
} while (items != 0);
|
||||||
|
|
||||||
server_client_loop();
|
server_client_loop();
|
||||||
|
Loading…
Reference in New Issue
Block a user