From 7bc6c105b7565441e8b32f4f77099cb5c3274611 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 24 Sep 2018 15:29:56 +0000
Subject: [PATCH] Only include pane status in minimum size if it is turned on,
 GitHub issue 1480.

---
 layout.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/layout.c b/layout.c
index e1112ffa..4ad645e0 100644
--- a/layout.c
+++ b/layout.c
@@ -236,7 +236,7 @@ layout_need_status(struct layout_cell *lc, int at_top)
 {
 	struct layout_cell	*first_lc;
 
-	if (lc->parent) {
+	if (lc->parent != NULL) {
 		if (lc->parent->type == LAYOUT_LEFTRIGHT)
 			return (layout_need_status(lc->parent, at_top));
 
@@ -349,7 +349,9 @@ layout_resize_check(struct window *w, struct layout_cell *lc,
 {
 	struct layout_cell	*lcchild;
 	u_int			 available, minimum;
+	int			 status;
 
+	status = options_get_number(w->options, "pane-border-status");
 	if (lc->type == LAYOUT_WINDOWPANE) {
 		/* Space available in this cell only. */
 		minimum = PANE_MINIMUM;
@@ -357,9 +359,8 @@ layout_resize_check(struct window *w, struct layout_cell *lc,
 			available = lc->sx;
 		else {
 			available = lc->sy;
-			minimum += layout_need_status(lc,
-			    options_get_number(w->options,
-			    "pane-border-status") == 1);
+			if (status != 0)
+				minimum += layout_need_status(lc, status == 1);
 		}
 		if (available > minimum)
 			available -= minimum;