aboutsummaryrefslogtreecommitdiff
path: root/cmd-switch-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-07-06 16:01:10 +0100
committerThomas Adam <thomas@xteddy.org>2015-07-06 16:01:10 +0100
commit9a0ce98c54897f042f4fd3eced6503397f3aa5d2 (patch)
treef55b7ee81e575c46baad615bd845a1ad7991c7f8 /cmd-switch-client.c
parent78723af99f52251aec11d586a507e34b5d0fcaf6 (diff)
parentb298478435c2e32b788566d1fab93dee1b71ff60 (diff)
downloadrtmux-9a0ce98c54897f042f4fd3eced6503397f3aa5d2.tar.gz
rtmux-9a0ce98c54897f042f4fd3eced6503397f3aa5d2.tar.bz2
rtmux-9a0ce98c54897f042f4fd3eced6503397f3aa5d2.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-switch-client.c')
-rw-r--r--cmd-switch-client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 23751d73..4bac540d 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -119,7 +119,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
}
}
- if (c != NULL && s != c->session && !args_has(args, 'E')) {
+ if (c != NULL && !args_has(args, 'E')) {
update = options_get_string(&s->options, "update-environment");
environ_update(update, &c->environ, &s->environ);
}