diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-14 02:01:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-14 02:01:14 +0100 |
| commit | 117737c6cae90d8c53c73fd2440eec17def10bb1 (patch) | |
| tree | bcc25aa554c0c0ce9456c629e29dc5d58ba54df0 /cmd-new-session.c | |
| parent | a7ce19347a81282b82db1663eed5fd8dd00e927f (diff) | |
| parent | 4289a1ebfa7479413ec5ac543b88c4ea039d00a0 (diff) | |
| download | rtmux-117737c6cae90d8c53c73fd2440eec17def10bb1.tar.gz rtmux-117737c6cae90d8c53c73fd2440eec17def10bb1.tar.bz2 rtmux-117737c6cae90d8c53c73fd2440eec17def10bb1.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 5292efcc..5924b793 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -80,6 +80,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) u_int sx, sy; struct format_tree *ft; struct environ_entry *envent; + struct cmd_find_state fs; if (self->entry == &cmd_has_session_entry) { /* @@ -310,13 +311,15 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) format_free(ft); } - cmd_find_from_session(&cmdq->current, s); - if (!detached) cmdq->client_exit = 0; if (to_free != NULL) free((void *)to_free); + + cmd_find_from_session(&fs, s); + if (hooks_wait(s->hooks, cmdq, &fs, "after-new-session") == 0) + return (CMD_RETURN_WAIT); return (CMD_RETURN_NORMAL); error: |