mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "don't save remapping path and don't load the library at startup"

Browse Source 
This reverts commit 1638df4ae72dc9b29c346279b1ab10359e2f1d3f.
This commit is contained in:
twinaphex 2016-02-21 19:05:01 +01:00
parent 1638df4ae7
commit e93e75321f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configuration.c
View File

@ -1528,10 +1528,8 @@ static bool config_load_file(const char *path, bool set_defaults)
config_get_array(conf, "input_joypad_driver", settings->input.joypad_driver, sizeof(settings->input.joypad_driver)); config_get_array(conf, "input_joypad_driver", settings->input.joypad_driver, sizeof(settings->input.joypad_driver));
config_get_array(conf, "input_keyboard_layout", settings->input.keyboard_layout, sizeof(settings->input.keyboard_layout)); config_get_array(conf, "input_keyboard_layout", settings->input.keyboard_layout, sizeof(settings->input.keyboard_layout));
#ifdef RARCH_CONSOLE
if (!global->has_set.libretro) if (!global->has_set.libretro)
config_get_path(conf, "libretro_path", settings->libretro, sizeof(settings->libretro)); config_get_path(conf, "libretro_path", settings->libretro, sizeof(settings->libretro));
#endif
if (!global->has_set.libretro_directory) if (!global->has_set.libretro_directory)
config_get_path(conf, "libretro_directory", settings->libretro_directory, sizeof(settings->libretro_directory)); config_get_path(conf, "libretro_directory", settings->libretro_directory, sizeof(settings->libretro_directory));
@ -1566,8 +1564,8 @@ static bool config_load_file(const char *path, bool set_defaults)
} }
} }
/*config_get_path(conf, "input_remapping_path", settings->input.remapping_path, config_get_path(conf, "input_remapping_path", settings->input.remapping_path,
sizeof(settings->input.remapping_path));*/ sizeof(settings->input.remapping_path));
config_get_path(conf, "resampler_directory", settings->resampler_directory, config_get_path(conf, "resampler_directory", settings->resampler_directory,
sizeof(settings->resampler_directory)); sizeof(settings->resampler_directory));
config_get_path(conf, "cache_directory", settings->cache_directory, config_get_path(conf, "cache_directory", settings->cache_directory,
@ -2554,9 +2552,7 @@ bool config_save_file(const char *path)
settings->multimedia.builtin_imageviewer_enable); settings->multimedia.builtin_imageviewer_enable);
config_set_bool(conf, "fps_show", settings->fps_show); config_set_bool(conf, "fps_show", settings->fps_show);
config_set_bool(conf, "ui_menubar_enable", settings->ui.menubar_enable); config_set_bool(conf, "ui_menubar_enable", settings->ui.menubar_enable);
#ifdef RARCH_CONSOLE
config_set_path(conf, "libretro_path", settings->libretro); config_set_path(conf, "libretro_path", settings->libretro);
#endif
config_set_path(conf, "core_options_path", settings->core_options_path); config_set_path(conf, "core_options_path", settings->core_options_path);
config_set_path(conf, "recording_output_directory", global->record.output_dir); config_set_path(conf, "recording_output_directory", global->record.output_dir);
@ -2699,8 +2695,8 @@ bool config_save_file(const char *path)
settings->cache_directory); settings->cache_directory);
config_set_path(conf, "input_remapping_directory", config_set_path(conf, "input_remapping_directory",
settings->input_remapping_directory); settings->input_remapping_directory);
/*config_set_path(conf, "input_remapping_path", config_set_path(conf, "input_remapping_path",
settings->input.remapping_path);*/ settings->input.remapping_path);
config_set_path(conf, "resampler_directory", config_set_path(conf, "resampler_directory",
settings->resampler_directory); settings->resampler_directory);
config_set_string(conf, "audio_resampler", settings->audio.resampler); config_set_string(conf, "audio_resampler", settings->audio.resampler);