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

Merge pull request #8909 from plaidman/master

Browse Source 
fixing duplicate "restart retroarch" entries in lakka
This commit is contained in:
Twinaphex 2019-06-04 02:52:46 +02:00 committed by GitHub
commit a6895360b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intl/msg_hash_us.h
View File

@ -2178,6 +2178,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH, MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH,
"Quit RetroArch" "Quit RetroArch"
) )
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
"Restart RetroArch"
)
#endif #endif
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG, MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
@ -2382,10 +2386,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RESTART_CONTENT, MENU_ENUM_LABEL_VALUE_RESTART_CONTENT,
"Restart" "Restart"
) )
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
"Restart RetroArch"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_RESUME, MENU_ENUM_LABEL_VALUE_RESUME,
"Resume" "Resume"

2
menu/menu_setting.c
View File

@ -6649,7 +6649,7 @@ static bool setting_append_list(
&subgroup_info, &subgroup_info,
parent_group); parent_group);
#if !defined(IOS) #if !defined(IOS) && !defined(HAVE_LAKKA)
if (frontend_driver_has_fork()) if (frontend_driver_has_fork())
{ {
CONFIG_ACTION( CONFIG_ACTION(