| 864 |
{ |
{ |
| 865 |
if (p_menu->title.row == 0 && p_menu->title.col == 0) |
if (p_menu->title.row == 0 && p_menu->title.col == 0) |
| 866 |
{ |
{ |
| 867 |
show_top(p_menu->title.text); |
show_top(p_menu->title.text, BBS_name, ""); |
| 868 |
} |
} |
| 869 |
else |
else |
| 870 |
{ |
{ |
| 1306 |
|
|
| 1307 |
int unload_menu(MENU_SET *p_menu_set) |
int unload_menu(MENU_SET *p_menu_set) |
| 1308 |
{ |
{ |
| 1309 |
|
int shmid; |
| 1310 |
|
|
| 1311 |
if (p_menu_set->p_menu_name_dict != NULL) |
if (p_menu_set->p_menu_name_dict != NULL) |
| 1312 |
{ |
{ |
| 1313 |
trie_dict_destroy(p_menu_set->p_menu_name_dict); |
trie_dict_destroy(p_menu_set->p_menu_name_dict); |
| 1320 |
p_menu_set->p_menu_screen_dict = NULL; |
p_menu_set->p_menu_screen_dict = NULL; |
| 1321 |
} |
} |
| 1322 |
|
|
| 1323 |
|
shmid = p_menu_set->shmid; |
| 1324 |
|
|
| 1325 |
detach_menu_shm(p_menu_set); |
detach_menu_shm(p_menu_set); |
| 1326 |
|
|
| 1327 |
if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1) |
if (shmctl(shmid, IPC_RMID, NULL) == -1) |
| 1328 |
{ |
{ |
| 1329 |
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); |
| 1330 |
return -1; |
return -1; |
| 1331 |
} |
} |
| 1332 |
|
|
| 1341 |
p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP); |
p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP); |
| 1342 |
if (p_shm == (void *)-1) |
if (p_shm == (void *)-1) |
| 1343 |
{ |
{ |
| 1344 |
log_error("shmat() error (%d)\n", errno); |
log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno); |
| 1345 |
return -1; |
return -1; |
| 1346 |
} |
} |
| 1347 |
|
|