Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam 2021-02-27 00:01:19 +00:00
commit a7d4703bfe

View File

@ -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;