diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-09-18 14:01:19 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-09-18 14:01:19 +0100 |
| commit | ca5afb34bfdcaddbaed12e7375b48c05019e4c18 (patch) | |
| tree | 5f841425b93c5b5487b74bfbf26bf20bf2a896cc /window-customize.c | |
| parent | eea85fb4c741e6e08df77de414aac124743908ff (diff) | |
| parent | 88b66e9e28733676b15a996d8fb5cbf66e01bc88 (diff) | |
| download | rtmux-ca5afb34bfdcaddbaed12e7375b48c05019e4c18.tar.gz rtmux-ca5afb34bfdcaddbaed12e7375b48c05019e4c18.tar.bz2 rtmux-ca5afb34bfdcaddbaed12e7375b48c05019e4c18.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-customize.c')
| -rw-r--r-- | window-customize.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/window-customize.c b/window-customize.c index c8606245..1dad07cd 100644 --- a/window-customize.c +++ b/window-customize.c @@ -380,7 +380,7 @@ window_customize_build_options(struct window_customize_modedata *data, struct format_tree *ft, const char *filter, struct cmd_find_state *fs) { struct mode_tree_item *top; - struct options_entry *o, *loop; + struct options_entry *o = NULL, *loop; const char **list = NULL, *name; u_int size = 0, i; enum window_customize_scope scope; @@ -1018,7 +1018,7 @@ window_customize_set_option(struct client *c, struct options *oo; struct window_customize_itemdata *new_item; int flag, idx = item->idx; - enum window_customize_scope scope; + enum window_customize_scope scope = WINDOW_CUSTOMIZE_NONE; u_int choice; const char *name = item->name, *space = ""; char *prompt, *value, *text; @@ -1031,7 +1031,7 @@ window_customize_set_option(struct client *c, return; oe = options_table_entry(o); - if (~oe->scope & OPTIONS_TABLE_PANE) + if (oe != NULL && ~oe->scope & OPTIONS_TABLE_PANE) pane = 0; if (oe != NULL && (oe->flags & OPTIONS_TABLE_IS_ARRAY)) { scope = item->scope; |