From a8857fc7abc10279a4cd7e55f243f7a9af7c1ae9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 24 Jul 2014 23:35:53 +0200 Subject: [PATCH] (Menu) Fixup MENU_SETTINGS_CONTENT_HISTORY_PATH somewhat --- frontend/menu/backend/menu_common_backend.c | 5 ++++- frontend/menu/backend/menu_common_backend.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 1a0bf70ff4..7be87d39f8 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -1889,6 +1889,7 @@ static int menu_settings_iterate(unsigned action) menu_type == MENU_SETTINGS_VIDEO_SOFTFILTER || menu_type == MENU_SETTINGS_AUDIO_DSP_FILTER || menu_type == MENU_SETTINGS_OVERLAY_PRESET || + menu_type == MENU_SETTINGS_CONTENT_HISTORY_PATH || menu_type == MENU_SETTINGS_CORE || menu_type == MENU_SETTINGS_CONFIG || menu_type == MENU_SETTINGS_DISK_APPEND || @@ -2242,6 +2243,8 @@ static void menu_parse_and_resolve(unsigned menu_type) exts = "dsp"; else if (menu_type == MENU_SETTINGS_OVERLAY_PRESET) exts = "cfg"; + else if (menu_type == MENU_SETTINGS_CONTENT_HISTORY_PATH) + exts = "cfg"; else if (menu_common_type_is(menu_type) == MENU_FILE_DIRECTORY) exts = ""; // we ignore files anyway else if (driver.menu->defer_core) @@ -3977,7 +3980,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action) switch (action) { case MENU_ACTION_OK: - file_list_push(driver.menu->menu_stack, g_settings.game_history_path, setting, driver.menu->selection_ptr); + file_list_push(driver.menu->menu_stack, "", setting, driver.menu->selection_ptr); menu_clear_navigation(driver.menu); driver.menu->need_refresh = true; break; diff --git a/frontend/menu/backend/menu_common_backend.h b/frontend/menu/backend/menu_common_backend.h index 0c7dd0e097..f66aca1e7d 100644 --- a/frontend/menu/backend/menu_common_backend.h +++ b/frontend/menu/backend/menu_common_backend.h @@ -131,7 +131,6 @@ typedef enum MENU_SETTINGS_WINDOW_COMPOSITING_ENABLE, MENU_SETTINGS_PAUSE_IF_WINDOW_FOCUS_LOST, MENU_CONTENT_HISTORY_SIZE, - MENU_SETTINGS_CONTENT_HISTORY_PATH, MENU_SCREENSHOT_DIR_PATH, MENU_BROWSER_DIR_PATH, MENU_CONTENT_DIR_PATH, @@ -148,6 +147,7 @@ typedef enum MENU_SYSTEM_DIR_PATH, MENU_AUTOCONFIG_DIR_PATH, MENU_EXTRACTION_DIR_PATH, + MENU_SETTINGS_CONTENT_HISTORY_PATH, MENU_SETTINGS_RESTART_GAME, MENU_SETTINGS_AUDIO_DSP_FILTER, MENU_SETTINGS_AUDIO_MUTE,