ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use menu_setting_find anymore in action_ok_file_load

This commit is contained in:
twinaphex 2016-07-01 10:35:50 +02:00
parent 5953b63b4f
commit dc7a225f8d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/cbs/menu_cbs_ok.c
View File

@ -1427,6 +1427,7 @@ static int action_ok_file_load_detect_core(const char *path,
static int action_ok_file_load(const char *path, static int action_ok_file_load(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
char menu_path_new[PATH_MAX_LENGTH] = {0}; char menu_path_new[PATH_MAX_LENGTH] = {0};
char full_path_new[PATH_MAX_LENGTH] = {0}; char full_path_new[PATH_MAX_LENGTH] = {0};
const char *menu_label = NULL; const char *menu_label = NULL;
@ -1438,7 +1439,7 @@ static int action_ok_file_load(const char *path,
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit(); return menu_cbs_exit();
menu_entries_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL); menu_entries_get_last(menu_stack, &menu_path, &menu_label, &enum_idx, NULL);
strlcpy(menu_path_new, menu_path, sizeof(menu_path_new)); strlcpy(menu_path_new, menu_path, sizeof(menu_path_new));
@ -1454,7 +1455,7 @@ static int action_ok_file_load(const char *path,
sizeof(menu_path_new)); sizeof(menu_path_new));
} }
setting = menu_setting_find(menu_label); setting = menu_setting_find_enum(enum_idx);
if (menu_setting_get_type(setting) == ST_PATH) if (menu_setting_get_type(setting) == ST_PATH)
return action_ok_set_path(path, label, type, idx, entry_idx); return action_ok_set_path(path, label, type, idx, entry_idx);