Make update-environment an array as well.

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;