aboutsummaryrefslogtreecommitdiff
path: root/cmd-switch-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-09-23 14:27:11 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-09-23 14:27:11 +0100
commit06d4553a15db5b7b018e0d5a97a355ca341b0168 (patch)
treeed57a8dfd5d5703dc526142db5028089aebb49b4 /cmd-switch-client.c
parent1caebaa49a0a418b21724c3651e993224bfc12eb (diff)
parent7e9b87f396e117828c0db9dd53f4b01a82f35640 (diff)
downloadrtmux-06d4553a15db5b7b018e0d5a97a355ca341b0168.tar.gz
rtmux-06d4553a15db5b7b018e0d5a97a355ca341b0168.tar.bz2
rtmux-06d4553a15db5b7b018e0d5a97a355ca341b0168.zip
Merge branch 'master' of github.com:tmux/tmux
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 10171018..3a72886a 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -124,7 +124,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
environ_update(update, &c->environ, &s->environ);
}
- if (c->session != NULL)
+ if (c->session != NULL && c->session != s)
c->last_session = c->session;
c->session = s;
status_timer_start(c);