extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-23 16:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-02-04 16:01:13 +00:00
commit 26f899be10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd-new-session.c
View File

@ -68,7 +68,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
{ {
struct args *args = self->args; struct args *args = self->args;
struct client *c = cmdq->client; struct client *c = cmdq->client;
struct session *s, *attach_sess; struct session *s, *as;
struct session *groupwith = cmdq->state.tflag.s; struct session *groupwith = cmdq->state.tflag.s;
struct window *w; struct window *w;
struct environ *env; 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); cmdq_error(cmdq, "bad session name: %s", newname);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
if ((attach_sess = session_find(newname)) != NULL) { if ((as = session_find(newname)) != NULL) {
if (args_has(args, 'A')) { if (args_has(args, 'A')) {
/* /*
* This cmdq is now destined for * 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 * will have already been prepared, copy this
* session into its tflag so it can be used. * 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, return (cmd_attach_session(cmdq,
args_has(args, 'D'), 0, NULL, args_has(args, 'D'), 0, NULL,
args_has(args, 'E'))); args_has(args, 'E')));