Only set g_settings.game_history_path if a value has been found in the config file

This commit is contained in:
twinaphex 2014-07-25 20:36:22 +02:00
parent fb73970699
commit 9c3eb0bce4
1 changed files with 4 additions and 2 deletions

View File

@ -515,6 +515,8 @@ void config_set_defaults(void)
if (*g_defaults.config_path)
fill_pathname_expand_special(g_extern.config_path, g_defaults.config_path, sizeof(g_extern.config_path));
fill_pathname_resolve_relative(g_settings.game_history_path, g_extern.config_path, ".retroarch-game-history.txt", sizeof(g_settings.game_history_path));
g_extern.config_save_on_exit = config_save_on_exit;
@ -1087,8 +1089,8 @@ bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_INT(network_cmd_port, "network_cmd_port");
CONFIG_GET_BOOL(stdin_cmd_enable, "stdin_cmd_enable");
fill_pathname_resolve_relative(g_settings.game_history_path, g_extern.config_path, ".retroarch-game-history.txt", sizeof(g_settings.game_history_path));
CONFIG_GET_PATH(game_history_path, "game_history_path");
if (config_get_path(conf, "game_history_path", tmp_str, sizeof(tmp_str)))
strlcpy(g_settings.game_history_path, tmp_str, sizeof(g_settings.game_history_path));
CONFIG_GET_INT(game_history_size, "game_history_size");
CONFIG_GET_INT(input.turbo_period, "input_turbo_period");