mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Fix bug - if you were in XMB and you would set menu driver to

Browse Source 
RGUI, you could no longer go to the left or right tab
This commit is contained in:
twinaphex 2020-03-04 19:51:36 +01:00
parent 70602487be
commit 2f25db03ba
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/cbs/menu_cbs_left.c
View File

@ -229,8 +229,10 @@ static int action_left_mainmenu(unsigned type, const char *label,
bool wraparound)
{
menu_ctx_list_t list_info;
unsigned push_list = 0;
settings_t *settings = config_get_ptr();
unsigned push_list = 0;
settings_t *settings = config_get_ptr();
bool menu_nav_wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
const char *menu_ident = menu_driver_ident();
menu_driver_list_get_selection(&list_info);
@ -241,11 +243,11 @@ static int action_left_mainmenu(unsigned type, const char *label,
/* List switching functionality does not
* apply to RGUI or MaterialUI */
if ((list_info.size == 1) &&
!string_is_equal(settings->arrays.menu_driver, "rgui") &&
!string_is_equal(settings->arrays.menu_driver, "glui"))
!string_is_equal(menu_ident, "rgui") &&
!string_is_equal(menu_ident, "glui"))
{
if ((list_info.selection != 0)
|| settings->bools.menu_navigation_wraparound_enable)
|| menu_nav_wraparound_enable)
push_list = 1;
}
else

10
menu/cbs/menu_cbs_right.c
View File

@ -259,7 +259,9 @@ static int action_right_mainmenu(unsigned type, const char *label,
bool wraparound)
{
menu_ctx_list_t list_info;
settings_t *settings = config_get_ptr();
settings_t *settings = config_get_ptr();
bool menu_nav_wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
const char *menu_ident = menu_driver_ident();
menu_driver_list_get_selection(&list_info);
@ -270,8 +272,8 @@ static int action_right_mainmenu(unsigned type, const char *label,
/* Tab switching functionality does not
* apply to RGUI or MaterialUI */
if ((list_info.size == 1) &&
!string_is_equal(settings->arrays.menu_driver, "rgui") &&
!string_is_equal(settings->arrays.menu_driver, "glui"))
!string_is_equal(menu_ident, "rgui") &&
!string_is_equal(menu_ident, "glui"))
{
menu_ctx_list_t list_horiz_info;
menu_ctx_list_t list_tabs_info;
@ -283,7 +285,7 @@ static int action_right_mainmenu(unsigned type, const char *label,
menu_driver_list_get_size(&list_tabs_info);
if ((list_info.selection != (list_horiz_info.size + list_tabs_info.size))
|| settings->bools.menu_navigation_wraparound_enable)
|| menu_nav_wraparound_enable)
return action_right_goto_tab();
}
else