diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-24 22:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-24 22:01:13 +0000 |
| commit | 418ab1a553f46996d3524bab5c81b2c66fa7efc6 (patch) | |
| tree | b29b61f95da6d7732628cdfb6dcf5e23c2fede5e /cmd-switch-client.c | |
| parent | f38a6bbd816533d01d14c8bbafbb51621e5e1326 (diff) | |
| parent | ffc28a7765f4b560427404c9679966232655e67e (diff) | |
| download | rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.gz rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.bz2 rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-switch-client.c')
| -rw-r--r-- | cmd-switch-client.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 81f70d9c..cd46db39 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -53,7 +53,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item) struct client *c = state->c; struct session *s = item->state.tflag.s; struct window_pane *wp; - const char *tablename, *update; + const char *tablename; struct key_table *table; if (args_has(args, 'r')) @@ -102,10 +102,8 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item) } } - if (!args_has(args, 'E')) { - update = options_get_string(s->options, "update-environment"); - environ_update(update, c->environ, s->environ); - } + if (!args_has(args, 'E')) + environ_update(s->options, c->environ, s->environ); if (c->session != NULL && c->session != s) c->last_session = c->session; |