From ae541287d303fb253b3cd75341c318dcc6a8db4a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 20 Jun 2019 06:51:36 +0000
Subject: Expand command formats in %if and move the config file loading later
 (to when the first client has identified) so all the client formats are
 available, fixes problems reported by Thomas Sattler.

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

(limited to 'format.c')

diff --git a/format.c b/format.c
index 75521fd0..50b537fa 100644
--- a/format.c
+++ b/format.c
@@ -2006,10 +2006,10 @@ void
 format_defaults(struct format_tree *ft, struct client *c, struct session *s,
     struct winlink *wl, struct window_pane *wp)
 {
-	if (c != NULL)
+	if (c != NULL && c->name != NULL)
 		log_debug("%s: c=%s", __func__, c->name);
 	else
-		log_debug("%s: s=none", __func__);
+		log_debug("%s: c=none", __func__);
 	if (s != NULL)
 		log_debug("%s: s=$%u", __func__, s->id);
 	else
-- 
cgit