diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-06 14:01:15 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-06 14:01:15 +0000 |
| commit | a3428487a787c9ab43cd628338dcc290499891ae (patch) | |
| tree | a82222b0cd94e22370eaae0ed6a8c679202e10e5 /cmd-switch-client.c | |
| parent | 58642011df2ccb02d405626e641ad9f11945a276 (diff) | |
| parent | cae0fbbe8c7cc16ac38aa8149ef9b4e2a54bce0e (diff) | |
| download | rtmux-a3428487a787c9ab43cd628338dcc290499891ae.tar.gz rtmux-a3428487a787c9ab43cd628338dcc290499891ae.tar.bz2 rtmux-a3428487a787c9ab43cd628338dcc290499891ae.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 eb7c5351..81f70d9c 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -102,7 +102,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item) } } - if (c != NULL && !args_has(args, 'E')) { + if (!args_has(args, 'E')) { update = options_get_string(s->options, "update-environment"); environ_update(update, c->environ, s->environ); } |