From 64bdf7e48e6c8b82d34b83fb474043334e576060 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 24 Apr 2018 08:33:14 +0200 Subject: [PATCH] Prevent collision --- config.def.h | 2 +- configuration.c | 2 +- menu/menu_setting.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.def.h b/config.def.h index 3d4a78e496..55653b7dc8 100644 --- a/config.def.h +++ b/config.def.h @@ -305,7 +305,7 @@ static unsigned xmb_alpha_factor = 75; static unsigned menu_font_color_red = 255; static unsigned menu_font_color_green = 255; static unsigned menu_font_color_blue = 255; -static unsigned xmb_layout = 0; +static unsigned xmb_menu_layout = 0; static unsigned xmb_icon_theme = XMB_ICON_THEME_MONOCHROME; static unsigned xmb_theme = XMB_THEME_ELECTRIC_BLUE; #if defined(HAVE_LAKKA) || defined(__arm__) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) diff --git a/configuration.c b/configuration.c index 16b1c44ba9..bfd2615f37 100644 --- a/configuration.c +++ b/configuration.c @@ -1474,7 +1474,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings, SETTING_UINT("menu_left_thumbnails", &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false); SETTING_UINT("xmb_alpha_factor", &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false); SETTING_UINT("xmb_scale_factor", &settings->uints.menu_xmb_scale_factor, true, xmb_scale_factor, false); - SETTING_UINT("xmb_layout", &settings->uints.menu_xmb_layout, true, xmb_layout, false); + SETTING_UINT("xmb_layout", &settings->uints.menu_xmb_layout, true, xmb_menu_layout, false); SETTING_UINT("xmb_theme", &settings->uints.menu_xmb_theme, true, xmb_icon_theme, false); SETTING_UINT("xmb_menu_color_theme", &settings->uints.menu_xmb_color_theme, true, xmb_theme, false); SETTING_UINT("menu_font_color_red", &settings->uints.menu_font_color_red, true, menu_font_color_red, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 79651c3743..63ee542fc0 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5462,7 +5462,7 @@ static bool setting_append_list( &settings->uints.menu_xmb_layout, MENU_ENUM_LABEL_XMB_LAYOUT, MENU_ENUM_LABEL_VALUE_XMB_LAYOUT, - xmb_layout, + xmb_menu_layout, &group_info, &subgroup_info, parent_group,