From 43929afc2175bd5b194213a8d0f956db6e302e73 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 27 Jul 2014 03:05:11 +0200 Subject: [PATCH] Take out HAVE_DYNAMIC ifdef for menu_config_directory --- frontend/menu/backend/menu_common_backend.c | 4 ---- frontend/menu/menu_common.c | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index f95ef87102..56442ae53f 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -401,9 +401,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type) file_list_push(menu->selection_buf, current_setting->short_description, MENU_CONTENT_DIR_PATH, 0); if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "assets_directory"))) file_list_push(menu->selection_buf, current_setting->short_description, MENU_ASSETS_DIR_PATH, 0); -#ifdef HAVE_DYNAMIC file_list_push(menu->selection_buf, "Config Directory", MENU_CONFIG_DIR_PATH, 0); -#endif file_list_push(menu->selection_buf, "Core Directory", MENU_LIBRETRO_DIR_PATH, 0); if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_info_path"))) file_list_push(menu->selection_buf, current_setting->short_description, MENU_LIBRETRO_INFO_DIR_PATH, 0); @@ -2753,13 +2751,11 @@ static int menu_common_iterate(unsigned action) driver.menu_ctx->init_core_info(driver.menu); menu_flush_stack_type(MENU_SETTINGS_PATH_OPTIONS); } -#ifdef HAVE_DYNAMIC else if (menu_type == MENU_CONFIG_DIR_PATH) { strlcpy(g_settings.menu_config_directory, dir, sizeof(g_settings.menu_config_directory)); menu_flush_stack_type(MENU_SETTINGS_PATH_OPTIONS); } -#endif else if (menu_type == MENU_LIBRETRO_INFO_DIR_PATH) { if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_info_path"))) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 5216fc8163..57ce55b19c 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -115,14 +115,10 @@ void load_menu_game_prepare(void) msg_queue_push(g_extern.msg_queue, str, 1, 1); } - #ifdef RARCH_CONSOLE - if (g_extern.system.no_game || *g_extern.fullpath) -#endif - if (g_extern.history) - content_history_push(g_extern.history, - *g_extern.fullpath ? g_extern.fullpath : NULL, - g_settings.libretro, - driver.menu->info.library_name ? driver.menu->info.library_name : ""); + content_history_push(g_extern.history, + *g_extern.fullpath ? g_extern.fullpath : NULL, + g_settings.libretro, + driver.menu->info.library_name ? driver.menu->info.library_name : ""); } // redraw menu frame