diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
| commit | b11548e3db4361cd8312ffbd27472823bdab4d62 (patch) | |
| tree | a84b5cf79fb41bb60b6495c1a346bb360b224604 /cmd-attach-session.c | |
| parent | 88ebf5544e995d85b2f1416a216ac7f44f719eed (diff) | |
| parent | ab1d18d00febe161080b8e81331861481110809f (diff) | |
| download | rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.gz rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.bz2 rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.zip | |
Merge remote-tracking branch 'origin/master' into rahm
Diffstat (limited to 'cmd-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index cc795b22..4e2d15da 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -43,7 +43,7 @@ const struct cmd_entry cmd_attach_session_entry = { /* -t is special */ - .flags = CMD_STARTSERVER, + .flags = CMD_STARTSERVER|CMD_READONLY, .exec = cmd_attach_session_exec }; @@ -69,6 +69,7 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag, if (c == NULL) return (CMD_RETURN_NORMAL); + if (server_client_check_nested(c)) { cmdq_error(item, "sessions should be nested with care, " "unset $TMUX to force"); @@ -157,6 +158,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag, c->flags |= CLIENT_ATTACHED; } + if (cfg_finished) + cfg_show_causes(s); + return (CMD_RETURN_NORMAL); } |