circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 06:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-05-01 14:01:12 +01:00
parent 2b9f8ae485 87be2da4e1
commit fe4ef307b7
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server-client.c
View File

@ -862,10 +862,7 @@ server_client_reset_state(struct client *c)
struct options *oo = c->session->options;
int status, mode, o;
if (c->flags & CLIENT_SUSPENDED)
return;
if (c->flags & CLIENT_CONTROL)
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
return;
tty_region(&c->tty, 0, c->tty.sy - 1);