From bedf8bd4373c48761ae42dbd8635fbc65d1c5cf8 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 4 Jul 2017 12:26:14 +0000 Subject: [PATCH] Handle 0 size of preview box in caller. --- mode-tree.c | 5 +++-- window-tree.c | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mode-tree.c b/mode-tree.c index 10a56304..8ce4c403 100644 --- a/mode-tree.c +++ b/mode-tree.c @@ -445,7 +445,7 @@ void mode_tree_draw(struct mode_tree_data *mtd) { struct window_pane *wp = mtd->wp; - struct screen *s = &mtd->screen, *box; + struct screen *s = &mtd->screen, *box = NULL; struct mode_tree_line *line; struct mode_tree_item *mti; struct options *oo = wp->window->options; @@ -571,7 +571,8 @@ mode_tree_draw(struct mode_tree_data *mtd) box_x = w - 4; box_y = sy - h - 2; - box = mtd->drawcb(mtd->modedata, mti->itemdata, box_x, box_y); + if (box_x != 0 && box_y != 0) + box = mtd->drawcb(mtd->modedata, mti->itemdata, box_x, box_y); if (box != NULL) { screen_write_cursormove(&ctx, 2, h + 1); screen_write_copy(&ctx, box, 0, 0, box_x, box_y, NULL, NULL); diff --git a/window-tree.c b/window-tree.c index 488a2e6d..2cbb18a7 100644 --- a/window-tree.c +++ b/window-tree.c @@ -422,8 +422,6 @@ window_tree_draw_session(struct session *s, struct screen_write_ctx *ctx, char *label; size_t len; - if (sx == 0) - return; total = winlink_count(&s->windows); memcpy(&gc, &grid_default_cell, sizeof gc); @@ -544,8 +542,6 @@ window_tree_draw_window(struct session *s, struct window *w, char *label; size_t len; - if (sx == 0) - return; total = window_count_panes(w); memcpy(&gc, &grid_default_cell, sizeof gc);