From aaf89ce5982aa3b4ddc1e18964500b7c20acfea8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 19 Apr 2015 12:24:35 +0200 Subject: [PATCH] Cut down on some more code --- menu/drivers/shared.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h index 588fccb8e6..8435974d29 100644 --- a/menu/drivers/shared.h +++ b/menu/drivers/shared.h @@ -123,6 +123,7 @@ static INLINE void get_title(const char *label, const char *dir, || !strcmp(elem0, "Font Settings") || !strcmp(elem0, "Shader Settings") || !strcmp(elem0, "Archive Settings") + || !strcmp(elem0, "Input Settings") ) { strlcpy(title, string_to_upper(elem0), sizeof_title); @@ -132,8 +133,7 @@ static INLINE void get_title(const char *label, const char *dir, strlcat(title, string_to_upper(elem1), sizeof_title); } } - else if (!strcmp(elem0, "Input Settings") || - menu_type == MENU_SETTINGS_CUSTOM_BIND || + else if (menu_type == MENU_SETTINGS_CUSTOM_BIND || menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD) { strlcpy(title, "INPUT SETTINGS", sizeof_title); @@ -143,12 +143,15 @@ static INLINE void get_title(const char *label, const char *dir, strlcat(title, string_to_upper(elem1), sizeof_title); } } - else if (!strcmp(label, "management")) - strlcpy(title, "MANAGEMENT", sizeof_title); - else if (!strcmp(label, "options")) - strlcpy(title, "OPTIONS", sizeof_title); - else if (!strcmp(label, "settings")) - strlcpy(title, "SETTINGS", sizeof_title); + else if (!strcmp(label, "management") + || !strcmp(label, "options") + || !strcmp(label, "settings") + ) + { + char upper_label[PATH_MAX_LENGTH]; + strlcpy(upper_label, label, sizeof(upper_label)); + strlcpy(title, string_to_upper(upper_label), sizeof_title); + } else if (!strcmp(label, "performance_counters")) strlcpy(title, "PERFORMANCE COUNTERS", sizeof_title); else if (!strcmp(label, "frontend_counters"))