From 758c1565fc5f504f7d2bad0ef361bba6c93ccac5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 16 Nov 2016 07:43:07 +0100 Subject: [PATCH] Merge Updater Settings into Network Settings --- menu/menu_displaylist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index de6e5d1a03..a141d7e894 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4960,6 +4960,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) PARSE_ONLY_BOOL, false) != -1) count++; + if (menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_UPDATER_SETTINGS, PARSE_ACTION, false) != -1) + count++; + if (count == 0) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND), @@ -5375,8 +5379,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, PARSE_ACTION, false); #endif - ret = menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_UPDATER_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_WIFI_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info,