diff options
| author |   nicm <nicm@openbsd.org> | 2016-04-30 18:59:02 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-04-30 18:59:02 +0000 |
| commit | 6bc468a09992d714263afb663d579d5ca45ad166 (patch) | |
| tree | 4ede954abc666af2752a482dc2935bc6d41ee8da /usr.bin/tmux/server-client.c | |
| parent | Mask all gpio interrupts when we attach. Fixes interrupt storm on the Lenovo (diff) | |
| download | wireguard-openbsd-6bc468a09992d714263afb663d579d5ca45ad166.tar.xz wireguard-openbsd-6bc468a09992d714263afb663d579d5ca45ad166.zip | |
tty_client_ready can not be internal to tty.c again.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 6a7fddbc4b1..5f744ba1c79 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.185 2016/04/29 15:00:48 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.186 2016/04/30 18:59:02 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -854,10 +854,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); |