From b298478435c2e32b788566d1fab93dee1b71ff60 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Jul 2015 14:24:57 +0000
Subject: Update environment with -E when attach-session used on an already
 attached session or switch-client used on the current session. From Cam
 Hutchison.

---
 cmd-switch-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-switch-client.c')

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);
 	}
-- 
cgit v1.2.3