Fix menu short-circuit loop

radxa-pkg · Oct 24, 2023 · 5b07243 · 5b07243
1 parent d1ec064
commit 5b07243
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/usr/lib/rsetup/mod/dialog/menu.sh b/src/usr/lib/rsetup/mod/dialog/menu.sh
@@ -49,8 +49,11 @@ menu_show() {
  __parameter_count_check 1 "$@"
 
  local item="0"
- if (( ${#RSETUP_MENU_CALLBACK[@]} == 1 )) || \
- item=$(__dialog --menu "$1" "${RSETUP_MENU[@]}" 3>&1 1>&2 2>&3 3>&-)
+ if (( ${#RSETUP_MENU_CALLBACK[@]} == 1 ))
+ then
+ RSETUP_MENU_SELECTED="$(menu_getitem "$item")"
+ switch_screen "${RSETUP_MENU_CALLBACK[$item]}"
+ elif item=$(__dialog --menu "$1" "${RSETUP_MENU[@]}" 3>&1 1>&2 2>&3 3>&-)
  then
  RSETUP_MENU_SELECTED="$(menu_getitem "$item")"
  push_screen "${RSETUP_MENU_CALLBACK[$item]}"