aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-08-30 21:44:01 +0100
committerThomas Adam <thomas@xteddy.org>2015-08-30 21:44:01 +0100
commitcb89f2f2a197db5bf7e1acc8248f381c6f0410cd (patch)
tree9074f8aa373b1bcb857fee46a47d305152cacf06 /server-client.c
parent486421ceff1b4d618d84ac3cb8c4dd9135b7960d (diff)
parentb87dc608d9b5b470926aaf77c5956befdfb7bc7b (diff)
downloadrtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.gz
rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.bz2
rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.zip
Merge branch 'obsd-master'
Conflicts: Makefile format.c
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/server-client.c b/server-client.c
index 1faf5968..632c5f99 100644
--- a/server-client.c
+++ b/server-client.c
@@ -550,13 +550,6 @@ server_client_handle_key(struct client *c, int key)
w = s->curw->window;
wp = w->active;
- /* No session, do nothing. */
- if (c->session == NULL)
- return;
- s = c->session;
- w = c->session->curw->window;
- wp = w->active;
-
/* Update the activity timer. */
if (gettimeofday(&c->activity_time, NULL) != 0)
fatal("gettimeofday failed");
@@ -716,6 +709,7 @@ server_client_loop(void)
}
wp->flags &= ~PANE_REDRAW;
}
+ check_window_name(w);
}
}