From 9cb806298edc6241243211fda14ba5d804a648b1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 17 Oct 2015 17:58:59 +0200 Subject: [PATCH] Use menu_list_get_ptr less --- menu/menu_setting.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 449632d3a7..3e33bb5b08 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -333,12 +333,12 @@ int menu_action_handle_setting(rarch_setting_t *setting, if (action == MENU_ACTION_OK) { size_t selection; - menu_list_t *menu_list = menu_list_get_ptr(); + file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return -1; - info.list = menu_list->menu_stack; + info.list = menu_stack; info.directory_ptr = selection; info.type = type; strlcpy(info.path, setting->default_value.string, sizeof(info.path)); @@ -509,14 +509,14 @@ int menu_setting_set(unsigned type, const char *label, unsigned action, bool wraparound) { size_t selection; - int ret = 0; - menu_file_list_cbs_t *cbs = NULL; - menu_list_t *menu_list = menu_list_get_ptr(); + int ret = 0; + menu_file_list_cbs_t *cbs = NULL; + file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return 0; - cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, selection); + cbs = menu_list_get_actiondata_at_offset(selection_buf, selection); if (!cbs) return 0; @@ -2504,7 +2504,7 @@ static void general_write_handler(void *data) settings_t *settings = config_get_ptr(); driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); - menu_list_t *menu_list = menu_list_get_ptr(); + file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr(); uint32_t hash = setting ? menu_hash_calculate(setting->name) : 0; uint64_t flags = menu_setting_get_flags(setting); @@ -2548,12 +2548,9 @@ static void general_write_handler(void *data) } break; case MENU_LABEL_HELP: - if (!menu_list) - return; - if (*setting->value.boolean) { - info.list = menu_list->menu_stack; + info.list = menu_stack; info.type = 0; info.directory_ptr = 0; strlcpy(info.label,