diff options
author | Thomas Adam <thomas@xteddy.org> | 2020-04-09 16:01:45 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2020-04-09 16:01:45 +0100 |
commit | 52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (patch) | |
tree | 8f6deb3d44616e92ff05735b4c587dfe3c5d8235 /cmd-show-options.c | |
parent | 916c3787d7464f66287f83814d563ff36ff3a96a (diff) | |
parent | 26f5dfbe46c75f8b907ee75daaadde9a310d8dfb (diff) | |
download | rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.tar.gz rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.tar.bz2 rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-show-options.c')
-rw-r--r-- | cmd-show-options.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmd-show-options.c b/cmd-show-options.c index da481139..bd044412 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -211,11 +211,9 @@ cmd_show_options_all(struct cmd *self, struct cmdq_item *item, int scope, if ((self->entry != &cmd_show_hooks_entry && !args_has(self->args, 'H') && - oe != NULL && (oe->flags & OPTIONS_TABLE_IS_HOOK)) || (self->entry == &cmd_show_hooks_entry && - (oe == NULL || - (~oe->flags & OPTIONS_TABLE_IS_HOOK)))) + (~oe->flags & OPTIONS_TABLE_IS_HOOK))) continue; o = options_get_only(oo, oe->name); |