From ec682695bab1ade9567f8b68f8e56f41cd5aaf0c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 6 Mar 2014 00:17:02 +0100 Subject: [PATCH] (RARCH_CONSOLE) Bake in 'Core Directory' in Path Settings --- frontend/menu/menu_common.c | 4 ++-- frontend/menu/menu_settings.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index c163675b0e..bf428de298 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -1277,13 +1277,13 @@ static int menu_iterate_func(void *data, unsigned action) strlcpy(g_extern.savestate_dir, dir, sizeof(g_extern.savestate_dir)); menu_flush_stack_type(rgui, RGUI_SETTINGS_PATH_OPTIONS); } -#ifdef HAVE_DYNAMIC else if (menu_type == RGUI_LIBRETRO_DIR_PATH) { strlcpy(rgui->libretro_dir, dir, sizeof(rgui->libretro_dir)); menu_init_core_info(rgui); menu_flush_stack_type(rgui, RGUI_SETTINGS_PATH_OPTIONS); } +#ifdef HAVE_DYNAMIC else if (menu_type == RGUI_CONFIG_DIR_PATH) { strlcpy(g_settings.rgui_config_directory, dir, sizeof(g_settings.rgui_config_directory)); @@ -2043,8 +2043,8 @@ void menu_populate_entries(void *data, unsigned menu_type) file_list_push(rgui->selection_buf, "Content Directory", RGUI_BROWSER_DIR_PATH, 0); #ifdef HAVE_DYNAMIC file_list_push(rgui->selection_buf, "Config Directory", RGUI_CONFIG_DIR_PATH, 0); - file_list_push(rgui->selection_buf, "Core Directory", RGUI_LIBRETRO_DIR_PATH, 0); #endif + file_list_push(rgui->selection_buf, "Core Directory", RGUI_LIBRETRO_DIR_PATH, 0); file_list_push(rgui->selection_buf, "Core Info Directory", RGUI_LIBRETRO_INFO_DIR_PATH, 0); #ifdef HAVE_SHADER_MANAGER file_list_push(rgui->selection_buf, "Shader Directory", RGUI_SHADER_DIR_PATH, 0); diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c index 44ed2de05a..e85f43d847 100644 --- a/frontend/menu/menu_settings.c +++ b/frontend/menu/menu_settings.c @@ -1119,7 +1119,6 @@ int menu_set_settings(void *data, unsigned setting, unsigned action) if (action == RGUI_ACTION_START) *g_extern.savestate_dir = '\0'; break; -#ifdef HAVE_DYNAMIC case RGUI_LIBRETRO_DIR_PATH: if (action == RGUI_ACTION_START) { @@ -1127,7 +1126,6 @@ int menu_set_settings(void *data, unsigned setting, unsigned action) menu_init_core_info(rgui); } break; -#endif case RGUI_LIBRETRO_INFO_DIR_PATH: if (action == RGUI_ACTION_START) {