From 0775687008dcfb2e811c8c25f78bcc251f0bbc84 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 2 Jul 2016 21:37:22 +0200 Subject: [PATCH] Cleanups --- intl/msg_hash_us.c | 2 ++ menu/menu_displaylist.c | 4 ---- menu/menu_setting.c | 2 -- msg_hash.h | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index c55b6f8c8d..4ba42b0678 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1364,6 +1364,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg) return "network_settings"; case MENU_ENUM_LABEL_USER_SETTINGS: return "user_settings"; + case MENU_ENUM_LABEL_LAKKA_SERVICES: + return "lakka_services"; case MENU_ENUM_LABEL_DIRECTORY_SETTINGS: return "directory_settings"; case MENU_ENUM_LABEL_PRIVACY_SETTINGS: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1104497f00..3b32a8c7b4 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4012,11 +4012,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_HELP_LIST, PARSE_ACTION, false); -#if !defined(IOS) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_QUIT_RETROARCH, PARSE_ACTION, false); -#endif #if defined(HAVE_LAKKA) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SHUTDOWN, @@ -4780,10 +4778,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_UPDATER_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_NETWORK_SETTINGS, PARSE_ACTION, false); -#ifdef HAVE_LAKKA ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_LAKKA_SERVICES, PARSE_ACTION, false); -#endif ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_PLAYLIST_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 9ead96e07a..d139a73826 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4088,7 +4088,6 @@ static bool setting_append_list( parent_group); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INFORMATION_LIST); -#ifndef HAVE_DYNAMIC CONFIG_ACTION( list, list_info, msg_hash_to_str(MENU_ENUM_LABEL_RESTART_RETROARCH), @@ -4098,7 +4097,6 @@ static bool setting_append_list( parent_group); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_RESTART_RETROARCH); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_RESTART_RETROARCH); -#endif CONFIG_ACTION( list, list_info, diff --git a/msg_hash.h b/msg_hash.h index 886d840fb7..6cbbaadb8d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1390,6 +1390,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS, MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS, MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, + MENU_ENUM_LABEL_LAKKA_SERVICES, MENU_ENUM_LABEL_ARCHIVE_SETTINGS, MENU_ENUM_LABEL_VALUE_USER_SETTINGS, MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,