Merge branch 'obsd-master' into master

1 files changed, 4 insertions, 4 deletions

diff --git a/format.c b/format.c
index 2476ad82..fb3fd332 100644
--- a/format.c
+++ b/format.c
@@ -4696,12 +4696,12 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
 	if (c != NULL && s != NULL && c->session != s)
 		log_debug("%s: session does not match", __func__);
 
-	if (s != NULL)
-		ft->type = FORMAT_TYPE_SESSION;
+	if (wp != NULL)
+		ft->type = FORMAT_TYPE_PANE;
 	else if (wl != NULL)
 		ft->type = FORMAT_TYPE_WINDOW;
-	else if (wp != NULL)
-		ft->type = FORMAT_TYPE_PANE;
+	else if (s != NULL)
+		ft->type = FORMAT_TYPE_SESSION;
 	else
 		ft->type = FORMAT_TYPE_UNKNOWN;