--- lbbs/src/menu.c	2025/05/15 08:53:23	1.42
+++ lbbs/src/menu.c	2025/05/18 03:23:57	1.45
@@ -663,11 +663,21 @@ int load_menu(MENU_SET *p_menu_set, cons
 	}
 	fclose(fin);
 
-	// Set menu_item->action_menu_id of each menu item pointing to a submenu to the menu_id of the corresponding submenu
 	for (menu_item_id = 0; menu_item_id < p_menu_set->menu_item_count; menu_item_id++)
 	{
 		p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
-		if (p_menu_item->submenu == 1 && strcmp(p_menu_item->action, "..") != 0)
+
+		// Set menu_item->action_cmd_handler of each menu item pointing to bbs_cmd
+		if (p_menu_item->submenu == 0)
+		{
+			if ((p_menu_item->action_cmd_handler = get_cmd_handler(p_menu_item->action)) == NULL)
+			{
+				log_error("Undefined menu action cmd handler [%s]\n", p_menu_item->action);
+				return -1;
+			}
+		}
+		// Set menu_item->action_menu_id of each menu item pointing to a submenu to the menu_id of the corresponding submenu
+		else if (strcmp(p_menu_item->action, "..") != 0)
 		{
 			if (trie_dict_get(p_menu_set->p_menu_name_dict, p_menu_item->action, (int64_t *)&menu_id) != 1)
 			{
@@ -880,7 +890,7 @@ int menu_control(MENU_SET *p_menu_set, i
 		}
 		else
 		{
-			return (exec_cmd(p_menu_item->action, p_menu_item->name));
+			return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));
 		}
 		break;
 	case KEY_LEFT:
@@ -959,6 +969,7 @@ int menu_control(MENU_SET *p_menu_set, i
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
 		display_menu_cursor(p_menu_set, 1);
 		break;
+	case KEY_HOME:
 	case KEY_PGUP:
 		display_menu_cursor(p_menu_set, 0);
 		menu_item_pos = 0;
@@ -982,6 +993,7 @@ int menu_control(MENU_SET *p_menu_set, i
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
 		display_menu_cursor(p_menu_set, 1);
 		break;
+	case KEY_END:
 	case KEY_PGDN:
 		display_menu_cursor(p_menu_set, 0);
 		menu_item_pos = p_menu->item_count - 1;
@@ -1038,13 +1050,11 @@ int unload_menu(MENU_SET *p_menu_set)
 	if (p_menu_set->p_menu_name_dict != NULL)
 	{
 		trie_dict_destroy(p_menu_set->p_menu_name_dict);
-		p_menu_set->p_menu_name_dict = NULL;
 	}
 
 	if (p_menu_set->p_menu_screen_dict != NULL)
 	{
 		trie_dict_destroy(p_menu_set->p_menu_screen_dict);
-		p_menu_set->p_menu_screen_dict = NULL;
 	}
 
 	unload_menu_shm(p_menu_set);
@@ -1061,18 +1071,16 @@ int unload_menu(MENU_SET *p_menu_set)
 int load_menu_shm(MENU_SET *p_menu_set)
 {
 	// Mount shared memory
-	if (p_menu_set->p_reserved != NULL)
+	if (p_menu_set->p_reserved == NULL)
 	{
-		log_error("Menu is already loaded\n");
-		return -1;
+		p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);
+		if (p_menu_set->p_reserved == (void *)-1)
+		{
+			log_error("shmat() error (%d)\n", errno);
+			return -1;
+		}
 	}
 
-	p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);
-	if (p_menu_set->p_reserved == (void *)-1)
-	{
-		log_error("shmat() error (%d)\n", errno);
-		return -2;
-	}
 	p_menu_set->p_menu_pool = p_menu_set->p_reserved + MENU_SET_RESERVED_LENGTH;
 	p_menu_set->p_menu_item_pool = p_menu_set->p_menu_pool + sizeof(MENU) * MAX_MENUS;
 	p_menu_set->p_menu_screen_pool = p_menu_set->p_menu_item_pool + sizeof(MENU_ITEM) * MAX_MENUITEMS;