diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-05-01 14:01:12 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-05-01 14:01:12 +0100 |
| commit | fe4ef307b736bae23068a4569c30a6b26021cad9 (patch) | |
| tree | 57b6e002bd648b0bcdaba57bd1949ca4a70c4c18 /server-client.c | |
| parent | 2b9f8ae485b05a87f22865f4662089f1f6e1e0e7 (diff) | |
| parent | 87be2da4e1fca4a1815420d557b6b7d381b60ee4 (diff) | |
| download | rtmux-fe4ef307b736bae23068a4569c30a6b26021cad9.tar.gz rtmux-fe4ef307b736bae23068a4569c30a6b26021cad9.tar.bz2 rtmux-fe4ef307b736bae23068a4569c30a6b26021cad9.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c index 7cd2f9bf..531d710c 100644 --- a/server-client.c +++ b/server-client.c @@ -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); |