diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
| commit | b11548e3db4361cd8312ffbd27472823bdab4d62 (patch) | |
| tree | a84b5cf79fb41bb60b6495c1a346bb360b224604 /window-customize.c | |
| parent | 88ebf5544e995d85b2f1416a216ac7f44f719eed (diff) | |
| parent | ab1d18d00febe161080b8e81331861481110809f (diff) | |
| download | rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.gz rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.bz2 rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.zip | |
Merge remote-tracking branch 'origin/master' into rahm
Diffstat (limited to 'window-customize.c')
| -rw-r--r-- | window-customize.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/window-customize.c b/window-customize.c index 0f09eba8..4a16e90c 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) @@ -680,9 +680,7 @@ window_customize_draw_option(struct window_customize_modedata *data, } ft = format_create_from_state(NULL, NULL, &fs); - if (oe == NULL) - text = "This is a user option."; - else if (oe->text == NULL) + if (oe == NULL || oe->text == NULL) text = "This option doesn't have a description."; else text = oe->text; |