mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
twinaphex 2015-12-11 18:56:00 +01:00
parent 9216fc9421
commit f9dfa403a9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_driver.c
View File

@ -593,7 +593,7 @@ void *menu_init(const void *data)
strlcpy(settings->menu.driver, menu_ctx->ident, strlcpy(settings->menu.driver, menu_ctx->ident,
sizeof(settings->menu.driver)); sizeof(settings->menu.driver));
if (!menu_entries_init(menu)) if (!menu_entries_init())
goto error; goto error;
if (!runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_INIT, NULL)) if (!runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_INIT, NULL))

12
menu/menu_entries.c
View File

@ -540,10 +540,9 @@ void menu_entries_unset_refresh(bool nonblocking)
} }
} }
bool menu_entries_init(void *data) bool menu_entries_init(void)
{ {
menu_entries_t *entries = (menu_entries_t*) menu_entries_t *entries = (menu_entries_t*)calloc(1, sizeof(*entries));
calloc(1, sizeof(*entries));
if (!entries) if (!entries)
goto error; goto error;
@ -551,10 +550,13 @@ bool menu_entries_init(void *data)
if (!(entries->menu_list = (menu_list_t*)menu_list_new())) if (!(entries->menu_list = (menu_list_t*)menu_list_new()))
goto error; goto error;
menu_entries_data = (struct menu_entries*)entries;
entries->list_settings = menu_setting_new(); entries->list_settings = menu_setting_new();
if (!entries->list_settings)
goto error;
menu_entries_data = (struct menu_entries*)entries;
return true; return true;
error: error:

2
menu/menu_entries.h
View File

@ -134,7 +134,7 @@ file_list_t *menu_entries_get_menu_stack_ptr(size_t idx);
void menu_entries_push(file_list_t *list, const char *path, const char *label, void menu_entries_push(file_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr, size_t entry_idx); unsigned type, size_t directory_ptr, size_t entry_idx);
bool menu_entries_init(void *data); bool menu_entries_init(void);
void menu_entries_free(void); void menu_entries_free(void);