diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-02-05 10:02:31 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-02-05 10:02:31 +0000 |
| commit | 88711e885eeab58fe372ce5aa64282f7557c3620 (patch) | |
| tree | 1f91e6d3f63e84ead5bf00f0a6d9b116dbf27a5c /server-client.c | |
| parent | 2d5101621b972a8e32d1ec29b544da46e88f319f (diff) | |
| parent | 7f4513ec34862805b06b2ff776785a36fdfec796 (diff) | |
| download | rtmux-88711e885eeab58fe372ce5aa64282f7557c3620.tar.gz rtmux-88711e885eeab58fe372ce5aa64282f7557c3620.tar.bz2 rtmux-88711e885eeab58fe372ce5aa64282f7557c3620.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server-client.c b/server-client.c index e144716a..4bee7616 100644 --- a/server-client.c +++ b/server-client.c @@ -193,7 +193,7 @@ server_client_create(int fd) c->tty.sx = 80; c->tty.sy = 24; - screen_init(&c->status, c->tty.sx, 1, 0); + screen_init(&c->status.status, c->tty.sx, 1, 0); c->message_string = NULL; TAILQ_INIT(&c->message_log); @@ -270,12 +270,12 @@ 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); - if (c->old_status != NULL) { - screen_free(c->old_status); - free(c->old_status); + 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); } free(c->title); |