aboutsummaryrefslogtreecommitdiff
path: root/cmd-new-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-06-01 12:01:20 +0100
committerThomas Adam <thomas@xteddy.org>2020-06-01 12:01:20 +0100
commit91e40de2da5124b1593c1c25462b8c9a36b8ebfd (patch)
treebaae9e8fbba21c26851ca4f451105ac194a1d688 /cmd-new-session.c
parent5ef790a6c41f5b78d2e757612b75cb9142b9173f (diff)
parenta54a88edd6fd893d4370feb9f9136e13096b891c (diff)
downloadrtmux-91e40de2da5124b1593c1c25462b8c9a36b8ebfd.tar.gz
rtmux-91e40de2da5124b1593c1c25462b8c9a36b8ebfd.tar.bz2
rtmux-91e40de2da5124b1593c1c25462b8c9a36b8ebfd.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
-rw-r--r--cmd-new-session.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index be29122d..cc3494de 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -165,7 +165,10 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
* the terminal as that calls tcsetattr() to prepare for tmux taking
* over.
*/
- if (!detached && !already_attached && c->fd != -1) {
+ if (!detached &&
+ !already_attached &&
+ c->fd != -1 &&
+ (~c->flags & CLIENT_CONTROL)) {
if (server_client_check_nested(cmdq_get_client(item))) {
cmdq_error(item, "sessions should be nested with care, "
"unset $TMUX to force");