diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 90410418ed..4fd5699b25 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -227,6 +227,8 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_MANAGER, "database_manager") MSG_HASH(MENU_ENUM_LABEL_DATABASE_MANAGER_LIST, "database_manager_list") +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_NETPLAY, + "deferred_netplay") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_MUSIC, "deferred_music") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_BROWSE_URL_START, diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index ba97c857bb..818a846582 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -315,6 +315,11 @@ static int deferred_push_netplay(menu_displaylist_info_t *info) return deferred_push_dlist(info, DISPLAYLIST_NETPLAY_ROOM_LIST); } +static int deferred_push_netplay_sublist(menu_displaylist_info_t *info) +{ + return deferred_push_dlist(info, DISPLAYLIST_NETPLAY); +} + static int deferred_push_content_settings(menu_displaylist_info_t *info) { return deferred_push_dlist(info, DISPLAYLIST_CONTENT_SETTINGS); @@ -1039,6 +1044,11 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rpl_entry_actions); } + else if (strstr(label, + msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_NETPLAY))) + { + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_netplay_sublist); + } else { if (cbs->enum_idx != MSG_UNKNOWN) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 33b6ae8c97..1bc42dd19a 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4159,6 +4159,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) /* TODO/FIXME ? */ break; case DISPLAYLIST_NETPLAY: + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); /* TODO/FIXME ? */ break; case DISPLAYLIST_DATABASE_ENTRY: diff --git a/msg_hash.h b/msg_hash.h index 4807d060fc..77cc700c1b 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -804,6 +804,7 @@ enum msg_hash_enums MENU_LABEL(BROWSE_URL), MENU_LABEL(BROWSE_START), /* Deferred */ + MENU_ENUM_LABEL_DEFERRED_NETPLAY, MENU_ENUM_LABEL_DEFERRED_MUSIC, MENU_ENUM_LABEL_DEFERRED_BROWSE_URL_START, MENU_ENUM_LABEL_DEFERRED_BROWSE_URL_LIST,