diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-07-12 19:47:47 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-07-12 19:47:47 +0100 |
| commit | 28c33f67bc7a93eaf8e6d96a56a88ee023811985 (patch) | |
| tree | 35fbcf8d34e1d88342098fe52701f5ab273dc867 /cmd-switch-client.c | |
| parent | 235e0bd65a49b469d661a9831067e3f745fbbaad (diff) | |
| parent | 9a0ce98c54897f042f4fd3eced6503397f3aa5d2 (diff) | |
| download | rtmux-28c33f67bc7a93eaf8e6d96a56a88ee023811985.tar.gz rtmux-28c33f67bc7a93eaf8e6d96a56a88ee023811985.tar.bz2 rtmux-28c33f67bc7a93eaf8e6d96a56a88ee023811985.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-switch-client.c')
| -rw-r--r-- | cmd-switch-client.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |