mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-20 02:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-03-18 15:07:51 +00:00
parent aa2b3472c5 ce6be7afd4
commit acb2413852
20 changed files with 692 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server-client.c
View File

@@ -202,7 +202,7 @@ server_client_create(int fd)
c->tty.sx = 80;
c->tty.sy = 24;
screen_init(&c->status.status, c->tty.sx, 1, 0);
status_init(c);
c->message_string = NULL;
TAILQ_INIT(&c->message_log);
@@ -279,13 +279,7 @@ server_client_lost(struct client *c)
if (c->stderr_data != c->stdout_data)
evbuffer_free(c->stderr_data);
if (event_initialized(&c->status.timer))
evtimer_del(&c->status.timer);
screen_free(&c->status.status);
if (c->status.old_status != NULL) {
screen_free(c->status.old_status);
free(c->status.old_status);
}
status_free(c);
free(c->title);
free((void *)c->cwd);
@@ -1547,7 +1541,7 @@ server_client_set_title(struct client *c)
ft = format_create(c, NULL, FORMAT_NONE, 0);
format_defaults(ft, c, NULL, NULL, NULL);
title = format_expand_time(ft, template, 0);
title = format_expand_time(ft, template);
if (c->title == NULL || strcmp(title, c->title) != 0) {
free(c->title);
c->title = xstrdup(title);