From 9bf8465e02307e996b198ba92b3ac00ee8e7a090 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 20 Jun 2017 02:47:55 +0200 Subject: [PATCH] Disable this by default for lakka and vita --- config.def.h | 8 ++++++-- menu/menu_displaylist.c | 17 +++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/config.def.h b/config.def.h index 9b4488e630..bbd02cb508 100644 --- a/config.def.h +++ b/config.def.h @@ -228,11 +228,15 @@ static const bool display_keyboard_overlay = false; #ifdef HAVE_MENU #include "menu/menu_driver.h" -static bool default_block_config_read = true; +static bool default_block_config_read = true; -static bool menu_show_online_updater = true; +static bool menu_show_online_updater = true; +#if defined(HAVE_LAKKA) || defined(VITA) +static bool menu_show_core_updater = false; +#else static bool menu_show_core_updater = true; +#endif #ifdef HAVE_XMB static unsigned xmb_scale_factor = 100; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 0d1bc4b8d1..ab888a02c0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3149,6 +3149,13 @@ static int menu_displaylist_parse_options( #ifdef HAVE_NETWORKING settings_t *settings = config_get_ptr(); + if (settings->bools.menu_show_core_updater) + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST), + msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST), + MENU_ENUM_LABEL_CORE_UPDATER_LIST, + MENU_SETTING_ACTION, 0, 0); + #ifdef HAVE_LAKKA menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA), @@ -3167,14 +3174,6 @@ static int menu_displaylist_parse_options( msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS), MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, MENU_SETTING_ACTION, 0, 0); -#else -#if !defined(VITA) - if (settings->bools.menu_show_core_updater) - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST), - msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST), - MENU_ENUM_LABEL_CORE_UPDATER_LIST, - MENU_SETTING_ACTION, 0, 0); #endif menu_entries_append_enum(info->list, @@ -3191,14 +3190,12 @@ static int menu_displaylist_parse_options( MENU_SETTING_ACTION, 0, 0); #endif -#if !defined(VITA) if (settings->bools.menu_show_core_updater) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES), msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES), MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES, MENU_SETTING_ACTION, 0, 0); -#endif #ifdef HAVE_UPDATE_ASSETS menu_entries_append_enum(info->list,