diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index bb7c606ab8..b1dc149909 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -730,6 +730,10 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = { { MENU_ENUM_LABEL_VIDEO_FILTER, deferred_push_video_filter + }, + { + MENU_ENUM_LABEL_NETPLAY, + deferred_push_netplay } }; @@ -1196,9 +1200,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_LABEL_RECORD_CONFIG: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_record_configfile); break; - case MENU_LABEL_NETPLAY: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_netplay); - break; case MENU_LABEL_CONTENT_SETTINGS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_settings); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index c4c680debc..488eda10af 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -476,6 +476,14 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_HELP_LIST, action_get_title_help + }, + { + MENU_ENUM_LABEL_HELP, + action_get_title_help + }, + { + MENU_ENUM_LABEL_NETPLAY, + action_get_netplay_list } }; @@ -954,9 +962,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL: BIND_ACTION_GET_TITLE(cbs, action_get_load_content_special); break; - case MENU_LABEL_NETPLAY: - BIND_ACTION_GET_TITLE(cbs, action_get_netplay_list); - break; case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_core_updater_list); break; @@ -1041,9 +1046,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_DEFERRED_ACCOUNTS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_list); break; - case MENU_LABEL_HELP: - BIND_ACTION_GET_TITLE(cbs, action_get_title_help); - break; case MENU_LABEL_INPUT_OVERLAY: BIND_ACTION_GET_TITLE(cbs, action_get_title_overlay); break; diff --git a/msg_hash.h b/msg_hash.h index ca5ddfad21..49ec2a5536 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1934,10 +1934,6 @@ enum msg_hash_enums #define MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC 0x7c9dec52U #define MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC 0x0059732bU -/* Main menu */ -#define MENU_LABEL_NETPLAY 0x0b511d22U -#define MENU_LABEL_HELP 0x7c97d2eeU - const char *msg_hash_to_str(enum msg_hash_enums msg); const char *msg_hash_to_str_fr(enum msg_hash_enums msg);