diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-07-23 16:01:17 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-07-23 16:01:17 +0100 |
| commit | 1f19355fb08c1013bb89299853b684ab1d7cdec9 (patch) | |
| tree | df6ca133eb22190e9047f0245a013550bf7fe5f2 | |
| parent | e0d984597b4504b05809a47888843ef572c1180f (diff) | |
| parent | 112b0f417c43e3f9ba7f5aa9df2e49dfdddfc225 (diff) | |
| download | rtmux-1f19355fb08c1013bb89299853b684ab1d7cdec9.tar.gz rtmux-1f19355fb08c1013bb89299853b684ab1d7cdec9.tar.bz2 rtmux-1f19355fb08c1013bb89299853b684ab1d7cdec9.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | window-customize.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/window-customize.c b/window-customize.c index f60d2e6e..ecafc776 100644 --- a/window-customize.c +++ b/window-customize.c @@ -403,9 +403,9 @@ window_customize_build_options(struct window_customize_modedata *data, for (i = 0; i < size; i++) { if (oo2 != NULL) o = options_get(oo0, list[i]); - else if (oo1 != NULL) + if (o == NULL && oo1 != NULL) o = options_get(oo1, list[i]); - else + if (o == NULL) o = options_get(oo2, list[i]); if (options_owner(o) == oo2) scope = scope2; |