diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-12-07 09:52:59 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-12-07 09:52:59 +0000 |
| commit | 138ffc7cb6225b8a6d54d771b0112635f0dbb42e (patch) | |
| tree | 289b9f8c4ca207f92b6d81f9511c520969241120 /window-customize.c | |
| parent | ef676e1202a4d5c423d5bba2f8ecba1f768d8364 (diff) | |
| parent | d721fb2a9fd70c157abb8540d4c50fca654f9f4d (diff) | |
| download | rtmux-138ffc7cb6225b8a6d54d771b0112635f0dbb42e.tar.gz rtmux-138ffc7cb6225b8a6d54d771b0112635f0dbb42e.tar.bz2 rtmux-138ffc7cb6225b8a6d54d771b0112635f0dbb42e.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'window-customize.c')
| -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 0f09eba8..98387e50 100644 --- a/window-customize.c +++ b/window-customize.c @@ -398,11 +398,11 @@ window_customize_build_options(struct window_customize_modedata *data, for (i = 0; i < size; i++) { if (oo2 != NULL) - o = options_get(oo0, list[i]); + o = options_get(oo2, list[i]); if (o == NULL && oo1 != NULL) o = options_get(oo1, list[i]); if (o == NULL) - o = options_get(oo2, list[i]); + o = options_get(oo0, list[i]); if (options_owner(o) == oo2) scope = scope2; else if (options_owner(o) == oo1) |