diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-12-27 14:43:20 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-12-27 14:43:20 +0000 |
| commit | cd46568ebe8b86bbaa6667132a8ea826ad3a7d3a (patch) | |
| tree | 79ae14376f553ca717142afda9335f0c10ab314e | |
| parent | 6ce8fe0537b34abd5e12fd9455f992c2da9e924b (diff) | |
| parent | 937f8ed095ea89b2ecbe7bf4e2922afc8afbf3eb (diff) | |
| download | rtmux-cd46568ebe8b86bbaa6667132a8ea826ad3a7d3a.tar.gz rtmux-cd46568ebe8b86bbaa6667132a8ea826ad3a7d3a.tar.bz2 rtmux-cd46568ebe8b86bbaa6667132a8ea826ad3a7d3a.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | screen-redraw.c | 2 | ||||
| -rw-r--r-- | status.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/screen-redraw.c b/screen-redraw.c index 7a31182a..1083642d 100644 --- a/screen-redraw.c +++ b/screen-redraw.c @@ -18,6 +18,7 @@ #include <sys/types.h> +#include <stdlib.h> #include <string.h> #include "tmux.h" @@ -299,6 +300,7 @@ screen_redraw_make_pane_status(struct client *c, struct window *w, screen_write_cnputs(&ctx, outlen, &gc, "%s", out); screen_write_stop(&ctx); + free(out); format_free(ft); wp->status_size = outlen; @@ -659,9 +659,10 @@ status_message_redraw(struct client *c) memcpy(&old_status, &c->status, sizeof old_status); lines = status_line_size(c->session); - if (lines <= 1) + if (lines <= 1) { + lines = 1; screen_init(&c->status, c->tty.sx, 1, 0); - else + } else screen_init(&c->status, c->tty.sx, lines, 0); len = screen_write_strlen("%s", c->message_string); @@ -811,9 +812,10 @@ status_prompt_redraw(struct client *c) memcpy(&old_status, &c->status, sizeof old_status); lines = status_line_size(c->session); - if (lines <= 1) + if (lines <= 1) { + lines = 1; screen_init(&c->status, c->tty.sx, 1, 0); - else + } else screen_init(&c->status, c->tty.sx, lines, 0); len = screen_write_strlen("%s", c->prompt_string); |