--- lbbs/src/menu.c 2025/06/25 01:50:14 1.69 +++ lbbs/src/menu.c 2025/10/17 01:25:08 1.74 @@ -39,6 +39,7 @@ #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) MENU_SET bbs_menu; +MENU_SET top10_menu; int load_menu(MENU_SET *p_menu_set, const char *conf_file) { @@ -988,6 +989,15 @@ int display_menu(MENU_SET *p_menu_set) return EXITMENU; } + if(p_menu->item_count <= 0) // empty menu + { + moveto(p_menu->screen_row, p_menu->screen_col); + clrtoeol(); + prints("没有可选项"); + press_any_key(); + return -1; + } + menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step]; menu_item_id = p_menu->items[menu_item_pos]; p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id); @@ -1059,7 +1069,7 @@ int display_menu(MENU_SET *p_menu_set) { moveto(p_menu->screen_row, p_menu->screen_col); clrtoeol(); - prints("ûпѡ"); + prints("没有可选项"); press_any_key(); return -1; } @@ -1131,7 +1141,6 @@ int menu_control(MENU_SET *p_menu_set, i switch (key) { case CR: - igetch_reset(); case KEY_RIGHT: if (p_menu_item->submenu) { @@ -1158,14 +1167,7 @@ int menu_control(MENU_SET *p_menu_set, i if (p_menu_set->choose_step > 0) { p_menu_set->choose_step--; - if (p_menu_set->choose_step == 0) - { - return REDRAW; - } - if (display_menu(p_menu_set) != 0) - { - return menu_control(p_menu_set, KEY_LEFT); - } + return REDRAW; } else {