diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-27 23:27:26 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-27 23:27:26 +0000 |
| commit | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (patch) | |
| tree | f5934e2f96c43f80bad7e3a219230d6337c9d208 /cmd-switch-client.c | |
| parent | 147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b (diff) | |
| parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff) | |
| download | rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.gz rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.bz2 rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
client.c
server-client.c
server.c
tmux.c
tmux.h
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 3a72886a..5a8c8b08 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -120,7 +120,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"); + update = options_get_string(s->options, "update-environment"); environ_update(update, &c->environ, &s->environ); } |