From f96ee3e6d6bb4562f7a5c7d3f6370f85e28938f2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 16 Jan 2017 21:31:30 +0100 Subject: [PATCH] (menu) cleanups; move variables --- menu/menu_displaylist.c | 3 +-- menu/menu_shader.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 84f802422e..c637fa9fd2 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -318,7 +318,6 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info) unsigned i; char tmp[PATH_MAX_LENGTH]; core_info_t *core_info = NULL; - settings_t *settings = config_get_ptr(); tmp[0] = '\0'; @@ -440,6 +439,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info) if (core_info->firmware_count > 0) { core_info_ctx_firmware_t firmware_info; + settings_t *settings = config_get_ptr(); firmware_info.path = core_info->path; firmware_info.directory.system = settings->directory.system; @@ -1715,7 +1715,6 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) char tmp[PATH_MAX_LENGTH]; char crc_str[20]; database_info_t *db_info_entry = &db_info->list[i]; - settings_t *settings = config_get_ptr(); bool show_advanced_settings = false; crc_str[0] = tmp[0] = '\0'; diff --git a/menu/menu_shader.c b/menu/menu_shader.c index aa299e49b6..a96319acb6 100644 --- a/menu/menu_shader.c +++ b/menu/menu_shader.c @@ -309,7 +309,6 @@ bool menu_shader_manager_save_preset( config_file_t *conf = NULL; bool ret = false; struct video_shader *shader = menu_shader_get(); - settings_t *settings = config_get_ptr(); buffer[0] = config_directory[0] = '\0'; preset_path[0] = '\0'; @@ -385,9 +384,10 @@ bool menu_shader_manager_save_preset( if (!fullpath) { - dirs[0] = settings->directory.video_shader; - dirs[1] = settings->directory.menu_config; - dirs[2] = config_directory; + settings_t *settings = config_get_ptr(); + dirs[0] = settings->directory.video_shader; + dirs[1] = settings->directory.menu_config; + dirs[2] = config_directory; } conf = (config_file_t*)config_file_new(NULL);