diff --git a/menu/menu_driver.c b/menu/menu_driver.c index ce6809dbc7..4e8816c373 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -1754,7 +1754,7 @@ static bool menu_init(menu_handle_t *menu_data) { settings_t *settings = config_get_ptr(); - if (!menu_entries_ctl(MENU_ENTRIES_CTL_INIT, NULL)) + if (!menu_entries_init()) return false; if (settings->bools.menu_show_start_screen) diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 85255c2ea2..3284ec4264 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -976,7 +976,7 @@ file_list_t *menu_entries_get_selection_buf_ptr(size_t idx) return menu_list_get_selection(menu_list, (unsigned)idx); } -static bool menu_entries_init(void) +bool menu_entries_init(void) { if (!menu_entries_ctl(MENU_ENTRIES_CTL_LIST_INIT, NULL)) goto error; @@ -1311,8 +1311,6 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data) file_list_clear(list); } break; - case MENU_ENTRIES_CTL_INIT: - return menu_entries_init(); case MENU_ENTRIES_CTL_SHOW_BACK: /* Returns true if a Back button should be shown * (i.e. we are at least diff --git a/menu/menu_entries.h b/menu/menu_entries.h index 753bb8e6fc..3e3621ac38 100644 --- a/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -36,7 +36,6 @@ enum menu_entries_ctl_state { MENU_ENTRIES_CTL_NONE = 0, MENU_ENTRIES_CTL_DEINIT, - MENU_ENTRIES_CTL_INIT, MENU_ENTRIES_CTL_LIST_GET, MENU_ENTRIES_CTL_LIST_DEINIT, MENU_ENTRIES_CTL_LIST_INIT, @@ -286,6 +285,8 @@ int menu_entry_action(menu_entry_t *entry, void menu_entry_init(menu_entry_t *entry); +bool menu_entries_init(void); + RETRO_END_DECLS #endif