mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(ovr) allow loading settings in an alternate variable

Browse Source
This commit is contained in:
radius 2016-08-25 00:33:23 -05:00
parent f6598f8e38
commit 0f3ea88f86
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configuration.c
View File

@ -1283,7 +1283,8 @@ static void config_get_hex_base(config_file_t *conf, const char *key, unsigned *
* Loads a config file and reads all the values into memory. * Loads a config file and reads all the values into memory.
* *
*/ */
static bool config_load_file(const char *path, bool set_defaults) static bool config_load_file(const char *path, bool set_defaults,
settings_t *settings)
{ {
unsigned i; unsigned i;
bool tmp_bool = false; bool tmp_bool = false;
@ -1293,7 +1294,8 @@ static bool config_load_file(const char *path, bool set_defaults)
char tmp_append_path[PATH_MAX_LENGTH] = {0}; /* Don't destroy append_config_path. */ char tmp_append_path[PATH_MAX_LENGTH] = {0}; /* Don't destroy append_config_path. */
unsigned msg_color = 0; unsigned msg_color = 0;
config_file_t *conf = NULL; config_file_t *conf = NULL;
settings_t *settings = config_get_ptr(); if (!settings)
settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
struct config_bool_setting_ptr bool_settings[] = { struct config_bool_setting_ptr bool_settings[] = {
@ -2208,7 +2210,7 @@ bool config_load_override(void)
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH);
if (!config_load_file(global->path.config, false)) if (!config_load_file(global->path.config, false, config_get_ptr()))
return false; return false;
/* Restore the libretro_path we're using /* Restore the libretro_path we're using
@ -2244,7 +2246,7 @@ bool config_unload_override(void)
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH);
if (config_load_file(global->path.config, false)) if (config_load_file(global->path.config, false, config_get_ptr()))
{ {
RARCH_LOG("Overrides: configuration overrides unloaded, original configuration restored.\n"); RARCH_LOG("Overrides: configuration overrides unloaded, original configuration restored.\n");
@ -2498,7 +2500,7 @@ static void parse_config_file(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
bool ret = config_load_file((*global->path.config) bool ret = config_load_file((*global->path.config)
? global->path.config : NULL, false); ? global->path.config : NULL, false, config_get_ptr());
if (!string_is_empty(global->path.config)) if (!string_is_empty(global->path.config))
{ {