mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Lakka updater

Browse Source
This commit is contained in:
Jean-André Santoni 2017-06-21 14:16:19 +02:00
parent d67348b467
commit e08089de48
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/drivers/materialui.c
View File

@ -1845,6 +1845,10 @@ static int mui_list_push(void *data, void *userdata,
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#if defined(HAVE_NETWORKING) #if defined(HAVE_NETWORKING)
#ifdef HAVE_LAKKA
entry.enum_idx = MENU_ENUM_LABEL_UPDATE_LAKKA;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#else
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (settings->bools.menu_show_online_updater) if (settings->bools.menu_show_online_updater)
@ -1853,6 +1857,7 @@ static int mui_list_push(void *data, void *userdata,
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
} }
} }
#endif
entry.enum_idx = MENU_ENUM_LABEL_NETPLAY; entry.enum_idx = MENU_ENUM_LABEL_NETPLAY;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);

5
menu/drivers/xmb.c
View File

@ -4066,6 +4066,10 @@ static int xmb_list_push(void *data, void *userdata,
entry.enum_idx = MENU_ENUM_LABEL_ADD_CONTENT_LIST; entry.enum_idx = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#if defined(HAVE_NETWORKING) #if defined(HAVE_NETWORKING)
#ifdef HAVE_LAKKA
entry.enum_idx = MENU_ENUM_LABEL_UPDATE_LAKKA;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#else
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (settings->bools.menu_show_online_updater) if (settings->bools.menu_show_online_updater)
@ -4074,6 +4078,7 @@ static int xmb_list_push(void *data, void *userdata,
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
} }
} }
#endif
#endif #endif
entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST; entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);

14
menu/menu_displaylist.c
View File

@ -3156,14 +3156,6 @@ static int menu_displaylist_parse_options(
MENU_ENUM_LABEL_CORE_UPDATER_LIST, MENU_ENUM_LABEL_CORE_UPDATER_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_LAKKA
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA),
msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_LAKKA),
MENU_ENUM_LABEL_UPDATE_LAKKA,
MENU_SETTING_ACTION, 0, 0);
#endif
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST),
msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST),
@ -6060,10 +6052,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
PARSE_ACTION, false); PARSE_ACTION, false);
#endif #endif
#if defined(HAVE_NETWORKING) #if defined(HAVE_NETWORKING)
#ifdef HAVE_LAKKA
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_UPDATE_LAKKA,
PARSE_ACTION, false);
#else
if (settings->bools.menu_show_online_updater) if (settings->bools.menu_show_online_updater)
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_ONLINE_UPDATER, MENU_ENUM_LABEL_ONLINE_UPDATER,
PARSE_ACTION, false); PARSE_ACTION, false);
#endif
#endif #endif
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false); MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false);

11
menu/menu_setting.c
View File

@ -2334,6 +2334,15 @@ static bool setting_append_list(
&subgroup_info, &subgroup_info,
parent_group); parent_group);
#ifdef HAVE_LAKKA
CONFIG_ACTION(
list, list_info,
MENU_ENUM_LABEL_UPDATE_LAKKA,
MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA,
&group_info,
&subgroup_info,
parent_group);
#else
CONFIG_ACTION( CONFIG_ACTION(
list, list_info, list, list_info,
MENU_ENUM_LABEL_ONLINE_UPDATER, MENU_ENUM_LABEL_ONLINE_UPDATER,
@ -2341,6 +2350,8 @@ static bool setting_append_list(
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group); parent_group);
#endif
#endif #endif
CONFIG_ACTION( CONFIG_ACTION(