diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
| commit | c01251d02388efceca515c47c257e2b5342e3716 (patch) | |
| tree | ca89407cb43bd2caa40a6854ba49ce1720e892ce /cmd-show-options.c | |
| parent | 5c275c2a1a963876d4ac392067e42120417dbf43 (diff) | |
| parent | 1466b570eedda0423d5a386d2b16b7ff0c0e477c (diff) | |
| download | rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.gz rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.bz2 rtmux-c01251d02388efceca515c47c257e2b5342e3716.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'cmd-show-options.c')
| -rw-r--r-- | cmd-show-options.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd-show-options.c b/cmd-show-options.c index ed93311a..e3ba821d 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -200,11 +200,13 @@ cmd_show_options_all(struct cmd *self, struct cmdq_item *item, int scope, u_int idx; int parent; - o = options_first(oo); - while (o != NULL) { - if (options_table_entry(o) == NULL) - cmd_show_options_print(self, item, o, -1, 0); - o = options_next(o); + if (cmd_get_entry(self) != &cmd_show_hooks_entry) { + o = options_first(oo); + while (o != NULL) { + if (options_table_entry(o) == NULL) + cmd_show_options_print(self, item, o, -1, 0); + o = options_next(o); + } } for (oe = options_table; oe->name != NULL; oe++) { if (~oe->scope & scope) |