From 315961faeceefae30d3fcce28c3171fdec7e5c5d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 9 Apr 2020 13:53:50 +0000
Subject: Some more, and use of wp->window before wp NULL check in format.c.

---
 format.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 6300b332..24710f15 100644
--- a/format.c
+++ b/format.c
@@ -900,11 +900,12 @@ static void
 format_cb_pane_at_top(struct format_tree *ft, struct format_entry *fe)
 {
 	struct window_pane	*wp = ft->wp;
-	struct window		*w = wp->window;
+	struct window		*w;
 	int			 status, flag;
 
 	if (wp == NULL)
 		return;
+	w = wp->window;
 
 	status = options_get_number(w->options, "pane-border-status");
 	if (status == PANE_STATUS_TOP)
@@ -919,11 +920,12 @@ static void
 format_cb_pane_at_bottom(struct format_tree *ft, struct format_entry *fe)
 {
 	struct window_pane	*wp = ft->wp;
-	struct window		*w = wp->window;
+	struct window		*w;
 	int			 status, flag;
 
 	if (wp == NULL)
 		return;
+	w = wp->window;
 
 	status = options_get_number(w->options, "pane-border-status");
 	if (status == PANE_STATUS_BOTTOM)
-- 
cgit