diff --git a/retroarch.c b/retroarch.c index 381eff4883..a3346ac549 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3047,7 +3047,6 @@ bool menu_entries_append_enum( size_t idx; const char *menu_path = NULL; menu_file_list_cbs_t *cbs = NULL; - const char *menu_ident = menu_driver_ident(); struct rarch_state *p_rarch = &rarch_st; if (!list || !label) @@ -3122,9 +3121,8 @@ bool menu_entries_append_enum( && enum_idx != MENU_ENUM_LABEL_RDB_ENTRY) cbs->setting = menu_setting_find_enum(enum_idx); - if (!string_is_equal(menu_ident, "null") && list) - menu_cbs_init(p_rarch->menu_driver_ctx, - list, cbs, path, label, type, idx); + menu_cbs_init(p_rarch->menu_driver_ctx, + list, cbs, path, label, type, idx); return true; } @@ -3205,9 +3203,8 @@ void menu_entries_prepend(file_list_t *list, file_list_set_actiondata(list, idx, cbs); - if (list) - menu_cbs_init(p_rarch->menu_driver_ctx, - list, cbs, path, label, type, idx); + menu_cbs_init(p_rarch->menu_driver_ctx, + list, cbs, path, label, type, idx); } void menu_entries_get_last_stack(const char **path, const char **label, diff --git a/retroarch_data.h b/retroarch_data.h index 6ab1f83866..64e263c8c1 100644 --- a/retroarch_data.h +++ b/retroarch_data.h @@ -2774,6 +2774,8 @@ static void *null_menu_init(void **userdata, bool video_is_threaded) return NULL; return menu; } +static int null_menu_list_bind_init(menu_file_list_cbs_t *cbs, + const char *path, const char *label, unsigned type, size_t idx) { return 0; } static menu_ctx_driver_t menu_ctx_null = { NULL, /* set_texture */ @@ -2805,7 +2807,7 @@ static menu_ctx_driver_t menu_ctx_null = { NULL, /* list_get_size */ NULL, /* list_get_entry */ NULL, /* list_set_selection */ - NULL, /* bind_init */ + null_menu_list_bind_init, NULL, /* load_image */ "null", NULL, /* environ */