diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-02-04 16:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-02-04 16:01:13 +0000 |
| commit | 26f899be109d2b7e8c8fae4ca8e3baaccf8d2655 (patch) | |
| tree | 247379a8f4f7aeb4d3cd470e1317d87014d9139c | |
| parent | 8760f877e1b28c08e6f292114b319b6c859047b0 (diff) | |
| parent | bdb8bb790ed53c0ea134c690c8f55b449eefbd3f (diff) | |
| download | rtmux-26f899be109d2b7e8c8fae4ca8e3baaccf8d2655.tar.gz rtmux-26f899be109d2b7e8c8fae4ca8e3baaccf8d2655.tar.bz2 rtmux-26f899be109d2b7e8c8fae4ca8e3baaccf8d2655.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-new-session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index ecbc5983..291107bc 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -68,7 +68,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct client *c = cmdq->client; - struct session *s, *attach_sess; + struct session *s, *as; struct session *groupwith = cmdq->state.tflag.s; struct window *w; struct environ *env; @@ -100,7 +100,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) cmdq_error(cmdq, "bad session name: %s", newname); return (CMD_RETURN_ERROR); } - if ((attach_sess = session_find(newname)) != NULL) { + if ((as = session_find(newname)) != NULL) { if (args_has(args, 'A')) { /* * This cmdq is now destined for @@ -108,7 +108,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq) * will have already been prepared, copy this * session into its tflag so it can be used. */ - cmdq->state.tflag.s = attach_sess; + cmd_find_from_session(&cmdq->state.tflag, as); return (cmd_attach_session(cmdq, args_has(args, 'D'), 0, NULL, args_has(args, 'E'))); |