From 126e115abda3596d8e7c729353bc8cdff3cb7c33 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 12 Aug 2014 03:55:07 +0200 Subject: [PATCH] (GX) Build fixes/cleanups --- frontend/frontend_salamander.c | 2 +- frontend/menu/backend/menu_common_backend.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c index 67e5ac5f31..9b09a0e6f7 100644 --- a/frontend/frontend_salamander.c +++ b/frontend/frontend_salamander.c @@ -86,7 +86,7 @@ static void find_and_set_first_file(char *path, size_t sizeof_path, const char * find_first_libretro_core(first_file, sizeof(first_file), g_defaults.core_dir, ext); - if (first_file) + if (first_file[0] != '\0') { fill_pathname_join(path, g_defaults.core_dir, first_file, sizeof_path); RARCH_LOG("libretro_path now set to: %s.\n", path); diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index fa5e446925..4b71277362 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -2966,19 +2966,17 @@ static unsigned menu_common_shader_manager_get_type(const struct gfx_shader *sha static int menu_common_shader_manager_setting_toggle(unsigned id, unsigned action, rarch_setting_t *setting) { - rarch_setting_t *setting_data, *current_setting; if (!driver.menu) { RARCH_ERR("Cannot toggle shader setting, menu handle is not initialized.\n"); return 0; } - (void)id; - (void)action; - - setting_data = (rarch_setting_t *)setting_data_get_list(); - #ifdef HAVE_SHADER_MANAGER + rarch_setting_t *current_setting; + + rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(); + unsigned dist_shader = id - MENU_SETTINGS_SHADER_0; unsigned dist_filter = id - MENU_SETTINGS_SHADER_0_FILTER; unsigned dist_scale = id - MENU_SETTINGS_SHADER_0_SCALE;