diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
| commit | a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a (patch) | |
| tree | ebfcd8a38514651c4657dac40601a5aafa360b89 /cmd-switch-client.c | |
| parent | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (diff) | |
| parent | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (diff) | |
| download | rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.gz rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.bz2 rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.zip | |
Merge branch 'obsd-master'
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 5a8c8b08..dbdc5b63 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -121,7 +121,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq) if (c != NULL && !args_has(args, 'E')) { update = options_get_string(s->options, "update-environment"); - environ_update(update, &c->environ, &s->environ); + environ_update(update, c->environ, s->environ); } if (c->session != NULL && c->session != s) |