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/1731/head
Thomas Adam 2019-04-30 09:02:29 +01:00
parent 7e0f9ab3eb 5a288b1efe
commit 4c5b0fbbcc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-select-pane.c
View File

@ -66,7 +66,7 @@ cmd_select_pane_redraw(struct window *w)
*/ */
TAILQ_FOREACH(c, &clients, entry) { TAILQ_FOREACH(c, &clients, entry) {
if (c->session == NULL) if (c->session == NULL || (c->flags & CLIENT_CONTROL))
continue; continue;
if (c->session->curw->window == w && tty_window_bigger(&c->tty)) if (c->session->curw->window == w && tty_window_bigger(&c->tty))
server_redraw_client(c); server_redraw_client(c);

7
window-tree.c
View File

@ -785,7 +785,8 @@ window_tree_search(__unused void *modedata, void *itemdata, const char *ss)
struct session *s; struct session *s;
struct winlink *wl; struct winlink *wl;
struct window_pane *wp; struct window_pane *wp;
const char *cmd; char *cmd;
int retval;
window_tree_pull_item(item, &s, &wl, &wp); window_tree_pull_item(item, &s, &wl, &wp);
@ -806,7 +807,9 @@ window_tree_search(__unused void *modedata, void *itemdata, const char *ss)
cmd = osdep_get_name(wp->fd, wp->tty); cmd = osdep_get_name(wp->fd, wp->tty);
if (cmd == NULL || *cmd == '\0') if (cmd == NULL || *cmd == '\0')
return (0); return (0);
return (strstr(cmd, ss) != NULL); retval = (strstr(cmd, ss) != NULL);
free(cmd);
return retval;
} }
return (0); return (0);
} }