From 791ba7ba04138c23d5e9ddbaabb0b4c408756ae2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 29 Nov 2014 16:40:33 +0100 Subject: [PATCH] Should fix history list not being saved when launching from CLI --- settings.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/settings.c b/settings.c index c9df5addcf..b7c3a59cf9 100644 --- a/settings.c +++ b/settings.c @@ -1219,15 +1219,22 @@ static bool config_load_file(const char *path, bool set_defaults) RARCH_WARN("savestate_directory is not a directory, ignoring ...\n"); } - if (g_settings.content_history_directory[0] != '\0') - fill_pathname_join(g_settings.content_history_path, - g_settings.content_history_directory, - "retroarch-content-history.txt", - sizeof(g_settings.content_history_path)); - else - fill_pathname_resolve_relative(g_settings.content_history_path, - g_extern.config_path, "retroarch-content-history.txt", - sizeof(g_settings.content_history_path)); + if (g_settings.content_history_path[0] == '\0') + { + if (g_settings.content_history_directory[0] != '\0') + { + fill_pathname_join(g_settings.content_history_path, + g_settings.content_history_directory, + "retroarch-content-history.txt", + sizeof(g_settings.content_history_path)); + } + else + { + fill_pathname_resolve_relative(g_settings.content_history_path, + g_extern.config_path, "retroarch-content-history.txt", + sizeof(g_settings.content_history_path)); + } + } if (!config_get_path(conf, "system_directory", g_settings.system_directory, sizeof(g_settings.system_directory)))