| Message ID | 20220324135443.1571-5-masahisa.kojima@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | enable menu-driven boot device selection | expand |
On 3/24/22 14:54, Masahisa Kojima wrote: > To make user aware of the menu entry selection, menu always > appears regardless of the number of entry. > > Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org> > --- > Newly created in v4 > > common/menu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/common/menu.c b/common/menu.c > index 5fb2ffbd06..b577d80b4f 100644 > --- a/common/menu.c > +++ b/common/menu.c > @@ -271,7 +271,7 @@ int menu_get_choice(struct menu *m, void **choice) > if (!m || !choice) > return -EINVAL; > > - if (!m->prompt || m->item_cnt == 1) > + if (!m->prompt) > return menu_default_choice(m, choice); As we can disable entering the console item_cnt may be zero. This case needs to be handled. Best regards Heinrich > > return menu_interactive_choice(m, choice);
diff --git a/common/menu.c b/common/menu.c index 5fb2ffbd06..b577d80b4f 100644 --- a/common/menu.c +++ b/common/menu.c @@ -271,7 +271,7 @@ int menu_get_choice(struct menu *m, void **choice) if (!m || !choice) return -EINVAL; - if (!m->prompt || m->item_cnt == 1) + if (!m->prompt) return menu_default_choice(m, choice); return menu_interactive_choice(m, choice);
To make user aware of the menu entry selection, menu always appears regardless of the number of entry. Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org> --- Newly created in v4 common/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)