diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-02-27 00:01:19 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-02-27 00:01:19 +0000 |
| commit | a7d4703bfe822f58dd14ee26cb9137d23f967a8c (patch) | |
| tree | 96faeec297c98aa513c83fc93d7e6695803be0bc /format.c | |
| parent | 9c6502fcc9bddcee4caa6f73bb4b578337ca1def (diff) | |
| parent | 583aaebc0ac437777ce796fc6cc29de7d488cf1a (diff) | |
| download | rtmux-a7d4703bfe822f58dd14ee26cb9137d23f967a8c.tar.gz rtmux-a7d4703bfe822f58dd14ee26cb9137d23f967a8c.tar.bz2 rtmux-a7d4703bfe822f58dd14ee26cb9137d23f967a8c.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'format.c')
| -rw-r--r-- | format.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; |