From 968dcf4d3921240c1f9a4e2e8f694cab8996ef05 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 9 Jul 2016 12:59:56 +0200 Subject: [PATCH] Rename settings --- configuration.c | 8 ++++++-- intl/msg_hash_us.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configuration.c b/configuration.c index b07fd4d4a3..b10ffd6f9e 100644 --- a/configuration.c +++ b/configuration.c @@ -1526,7 +1526,9 @@ static bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT_BASE(conf, settings, menu.xmb_scale_factor, "xmb_scale_factor"); CONFIG_GET_INT_BASE(conf, settings, menu.xmb_alpha_factor, "xmb_alpha_factor"); CONFIG_GET_INT_BASE(conf, settings, menu.xmb_theme, "xmb_theme"); - CONFIG_GET_INT_BASE(conf, settings, menu.background_gradient, "menu_background_gradient"); +#ifdef HAVE_XMB + CONFIG_GET_INT_BASE(conf, settings, menu.background_gradient, "xmb_menu_color_theme"); +#endif CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows_enable, "xmb_shadows_enable"); CONFIG_GET_INT_BASE(conf, settings, menu.shader_pipeline, "menu_shader_pipeline"); if (config_get_path(conf, "xmb_font", tmp_str, sizeof(tmp_str))) @@ -2938,7 +2940,9 @@ bool config_save_file(const char *path) config_set_int(conf, "xmb_scale_factor", settings->menu.xmb_scale_factor); config_set_int(conf, "xmb_alpha_factor", settings->menu.xmb_alpha_factor); config_set_int(conf, "xmb_theme", settings->menu.xmb_theme); - config_set_int(conf, "menu_background_gradient", settings->menu.background_gradient); +#ifdef HAVE_XMB + config_set_int(conf, "xmb_menu_color_theme", settings->menu.background_gradient); +#endif config_set_bool(conf, "xmb_shadows_enable", settings->menu.xmb_shadows_enable); config_set_int(conf, "menu_shader_pipeline", settings->menu.shader_pipeline); config_set_path(conf, "xmb_font", diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 22e94af781..28ad9a001e 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1627,7 +1627,7 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg) case MENU_ENUM_LABEL_XMB_THEME: return "xmb_theme"; case MENU_ENUM_LABEL_XMB_GRADIENT: - return "menu_color_theme"; + return "xmb_menu_color_theme"; case MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE: return "xmb_shadows_enable"; case MENU_ENUM_LABEL_XMB_RIBBON_ENABLE: