From 86d61550261b8c04622d46ad100c882b2b8deb7a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Feb 2015 09:30:44 +0100 Subject: [PATCH] Cleanups --- settings_data.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/settings_data.c b/settings_data.c index 2ceaa2797c..9756d5e8ef 100644 --- a/settings_data.c +++ b/settings_data.c @@ -2849,16 +2849,10 @@ void setting_data_get_label(void *data, char *type_str, const char *menu_label, const char *label, unsigned idx) { file_list_t *list = (file_list_t*)data; - rarch_setting_t *setting_data = NULL; - rarch_setting_t *setting = NULL; if (!driver.menu || !driver.menu->menu_list || !label) return; - setting_data = (rarch_setting_t*)driver.menu->list_settings; - setting = (rarch_setting_t*)setting_data_find_setting(setting_data, - list->list[idx].label); - #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) if ((!strcmp(menu_label, "Shader Options") || !strcmp(menu_label, "video_shader_parameters") || @@ -2968,11 +2962,13 @@ void setting_data_get_label(void *data, char *type_str, type - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN); else { + rarch_setting_t *setting_data = NULL; + rarch_setting_t *setting = NULL; + if (!driver.menu || !driver.menu->menu_list) return; setting_data = (rarch_setting_t*)driver.menu->list_settings; - setting = (rarch_setting_t*)setting_data_find_setting(setting_data, driver.menu->menu_list->selection_buf->list[idx].label);