diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2021-10-28 18:54:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2021-10-28 18:54:34 +0000 |
| commit | b6b5aee1335f92875e10d3b333cf4ad9e9fdd141 (patch) | |
| tree | f760aebfd1026b5453422a30a986a6fc8baaaa3b /usr.bin | |
| parent | 98d3b106b47b8e4c915877dee5e595aef9acefbf (diff) | |
Allow detach even if suspend flag set, GitHub issue 2932.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 8e372fd8d18..7879ce5606d 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.388 2021/10/11 13:27:50 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.389 2021/10/28 18:54:33 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -516,7 +516,7 @@ server_client_detach(struct client *c, enum msgtype msgtype) { struct session *s = c->session; - if (s == NULL || (c->flags & CLIENT_UNATTACHEDFLAGS)) + if (s == NULL || (c->flags & CLIENT_NODETACHFLAGS)) return; c->flags |= CLIENT_EXIT; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 8929f5de99a..9c663077c57 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.1151 2021/10/26 12:22:23 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.1152 2021/10/28 18:54:33 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1710,6 +1710,9 @@ struct client { (CLIENT_DEAD| \ CLIENT_SUSPENDED| \ CLIENT_EXIT) +#define CLIENT_NODETACHFLAGS \ + (CLIENT_DEAD| \ + CLIENT_EXIT) #define CLIENT_NOSIZEFLAGS \ (CLIENT_DEAD| \ CLIENT_SUSPENDED| \ |