--- lbbs/src/menu.c	2025/05/23 13:32:51	1.55
+++ lbbs/src/menu.c	2025/05/29 01:21:44	1.61
@@ -807,7 +807,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 	return 0;
 }
 
-static int display_menu_cursor(MENU_SET *p_menu_set, int show)
+int display_menu_cursor(MENU_SET *p_menu_set, int show)
 {
 	MENU_ID menu_id;
 	MENU_ITEM_ID menu_item_id;
@@ -864,7 +864,7 @@ static int display_menu_current_page(MEN
 	{
 		if (p_menu->title.row == 0 && p_menu->title.col == 0)
 		{
-			show_top(p_menu->title.text);
+			show_top(p_menu->title.text, BBS_name, "");
 		}
 		else
 		{
@@ -1116,6 +1116,7 @@ int menu_control(MENU_SET *p_menu_set, i
 			return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));
 		}
 		break;
+	case KEY_ESC:
 	case KEY_LEFT:
 		if (p_menu_set->choose_step > 0)
 		{
@@ -1306,6 +1307,13 @@ int menu_control(MENU_SET *p_menu_set, i
 
 int unload_menu(MENU_SET *p_menu_set)
 {
+	int shmid;
+
+	if (p_menu_set == NULL)
+	{
+		return -1;
+	}
+
 	if (p_menu_set->p_menu_name_dict != NULL)
 	{
 		trie_dict_destroy(p_menu_set->p_menu_name_dict);
@@ -1318,18 +1326,20 @@ int unload_menu(MENU_SET *p_menu_set)
 		p_menu_set->p_menu_screen_dict = NULL;
 	}
 
-	unload_menu_shm(p_menu_set);
+	shmid = p_menu_set->shmid;
 
-	if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)
+	detach_menu_shm(p_menu_set);
+
+	if (shmctl(shmid, IPC_RMID, NULL) == -1)
 	{
-		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", p_menu_set->shmid, errno);
+		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno);
 		return -1;
 	}
 
 	return 0;
 }
 
-int load_menu_shm(MENU_SET *p_menu_set)
+int set_menu_shm_readonly(MENU_SET *p_menu_set)
 {
 	void *p_shm;
 
@@ -1337,7 +1347,7 @@ int load_menu_shm(MENU_SET *p_menu_set)
 	p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP);
 	if (p_shm == (void *)-1)
 	{
-		log_error("shmat() error (%d)\n", errno);
+		log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno);
 		return -1;
 	}
 	
@@ -1346,7 +1356,7 @@ int load_menu_shm(MENU_SET *p_menu_set)
 	return 0;
 }
 
-int unload_menu_shm(MENU_SET *p_menu_set)
+int detach_menu_shm(MENU_SET *p_menu_set)
 {
 	p_menu_set->menu_count = 0;
 	p_menu_set->menu_item_count = 0;
@@ -1359,24 +1369,16 @@ int unload_menu_shm(MENU_SET *p_menu_set
 	p_menu_set->p_menu_screen_buf = NULL;
 	p_menu_set->p_menu_screen_buf_free = NULL;
 
+	p_menu_set->p_menu_name_dict = NULL;
+	p_menu_set->p_menu_screen_dict = NULL;
+
 	if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)
 	{
 		log_error("shmdt() error (%d)\n", errno);
 		return -1;
 	}
-	p_menu_set->p_reserved = NULL;
-
-	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;
-	}
+	p_menu_set->p_reserved = NULL;
 
 	return 0;
 }