From 2be56942da1e71ca05bd9a1a77bd9babe4bc3fd7 Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Fri, 9 Mar 2018 17:33:41 -0500 Subject: [PATCH] Since directories can't be post-overridden, that case still needs to be handled separately. --- configuration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration.c b/configuration.c index 7fea76f96a..69dfde6614 100644 --- a/configuration.c +++ b/configuration.c @@ -1746,8 +1746,10 @@ static void config_set_defaults(void) /* Make sure settings from other configs carry over into defaults * for another config. */ - dir_clear(RARCH_DIR_SAVEFILE); - dir_clear(RARCH_DIR_SAVESTATE); + if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL)) + dir_clear(RARCH_DIR_SAVEFILE); + if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL)) + dir_clear(RARCH_DIR_SAVESTATE); *settings->paths.path_libretro_info = '\0'; *settings->paths.directory_libretro = '\0';