- save osd color so it's copied correctly between per-core configs

- don't save nor load libretro core name
This commit is contained in:
radius 2016-03-18 20:27:55 -05:00
parent 7f5a6cdbf9
commit 2169f89946

View File

@ -1540,8 +1540,10 @@ 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));
#if 0
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));
@ -2561,7 +2563,9 @@ 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);
#if 0
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);
@ -2695,6 +2699,12 @@ bool config_save_file(const char *path)
config_set_float(conf, "video_font_size", settings->video.font_size); config_set_float(conf, "video_font_size", settings->video.font_size);
config_set_bool(conf, "video_font_enable", settings->video.font_enable); config_set_bool(conf, "video_font_enable", settings->video.font_enable);
float msg_color;
msg_color = (((int)(settings->video.msg_color_r * 255.0f) & 0xff) << 16) +
(((int)(settings->video.msg_color_g * 255.0f) & 0xff) << 8) +
(((int)(settings->video.msg_color_b * 255.0f) & 0xff));
config_set_hex(conf, "video_message_color", msg_color);
if (!global->has_set.ups_pref) if (!global->has_set.ups_pref)
config_set_bool(conf, "ups_pref", global->patch.ups_pref); config_set_bool(conf, "ups_pref", global->patch.ups_pref);
if (!global->has_set.bps_pref) if (!global->has_set.bps_pref)