diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-07-06 16:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-07-06 16:01:10 +0100 |
| commit | 9a0ce98c54897f042f4fd3eced6503397f3aa5d2 (patch) | |
| tree | f55b7ee81e575c46baad615bd845a1ad7991c7f8 | |
| parent | 78723af99f52251aec11d586a507e34b5d0fcaf6 (diff) | |
| parent | b298478435c2e32b788566d1fab93dee1b71ff60 (diff) | |
| download | rtmux-9a0ce98c54897f042f4fd3eced6503397f3aa5d2.tar.gz rtmux-9a0ce98c54897f042f4fd3eced6503397f3aa5d2.tar.bz2 rtmux-9a0ce98c54897f042f4fd3eced6503397f3aa5d2.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-attach-session.c | 6 | ||||
| -rw-r--r-- | cmd-switch-client.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index cb58d4e2..e7cde0f0 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -126,6 +126,12 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, s->cwd = fd; } + if (!Eflag) { + update = options_get_string(&s->options, + "update-environment"); + environ_update(update, &c->environ, &s->environ); + } + c->session = s; notify_attached_session_changed(c); session_update_activity(s); diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 23751d73..4bac540d 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -119,7 +119,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq) } } - if (c != NULL && s != c->session && !args_has(args, 'E')) { + if (c != NULL && !args_has(args, 'E')) { update = options_get_string(&s->options, "update-environment"); environ_update(update, &c->environ, &s->environ); } |