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

Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-06-17 01:07:52 +02:00
parent 795bdd351b
commit 6131dde4d8
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/menu_entries.c
View File

@ -728,8 +728,7 @@ bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data)
}
break;
case MENU_ENTRIES_CTL_SETTINGS_DEINIT:
if (menu_entries_list_settings)
menu_setting_ctl(MENU_SETTING_CTL_FREE, menu_entries_list_settings);
menu_setting_free(menu_entries_list_settings);
menu_entries_list_settings = NULL;
break;
case MENU_ENTRIES_CTL_SETTINGS_INIT:

9
menu/menu_setting.c
View File

@ -8031,13 +8031,12 @@ static bool setting_append_list(
return true;
}
static bool menu_setting_free(void *data)
bool menu_setting_free(void *data)
{
unsigned values, n;
rarch_setting_t *setting = (rarch_setting_t*)data;
unsigned values;
unsigned n;
if (!data)
if (!setting)
return false;
/* Free data which was previously tagged */
@ -8200,8 +8199,6 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data)
return false;
}
break;
case MENU_SETTING_CTL_FREE:
return menu_setting_free(data);
case MENU_SETTING_CTL_NEW:
{
rarch_setting_t **setting = (rarch_setting_t**)data;

3
menu/menu_setting.h
View File

@ -75,7 +75,6 @@ enum settings_free_flags
enum menu_setting_ctl_state
{
MENU_SETTING_CTL_NONE = 0,
MENU_SETTING_CTL_FREE,
MENU_SETTING_CTL_NEW,
MENU_SETTING_CTL_IS_OF_PATH_TYPE,
MENU_SETTING_CTL_ACTION_RIGHT
@ -395,6 +394,8 @@ void menu_settings_list_current_add_enum_idx(
rarch_setting_info_t *list_info,
enum menu_hash_enums enum_idx);
bool menu_setting_free(void *data);
bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data);
RETRO_END_DECLS