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

Prevent mouse/touch if overlays are enabled to avoid conflicting inputs.

Browse Source 
Users can still get locked out if they purposelly disable mouse/pointer and overlays and don't use a controller
This commit is contained in:
radius 2015-04-04 11:15:27 -05:00
parent 5bffebd203
commit d45593d578
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_entries_cbs_iterate.c
View File

@ -162,7 +162,7 @@ static int pointer_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
if (!menu) if (!menu)
return -1; return -1;
if (!settings->menu.pointer.enable) if (!settings->menu.pointer.enable || settings->input.overlay_enable)
return 0; return 0;
#if defined(HAVE_XMB) #if defined(HAVE_XMB)
@ -227,7 +227,7 @@ static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
if (!menu) if (!menu)
return -1; return -1;
if (!settings->menu.mouse.enable) if (!settings->menu.mouse.enable || settings->input.overlay_enable)
{ {
menu->mouse.wheeldown = false; menu->mouse.wheeldown = false;
menu->mouse.wheelup = false; menu->mouse.wheelup = false;

2
menu/menu_input.c
View File

@ -475,7 +475,7 @@ static int menu_input_mouse(unsigned *action)
if (!menu) if (!menu)
return -1; return -1;
if (!settings->menu.mouse.enable) if (!settings->menu.mouse.enable || settings->input.overlay_enable)
{ {
menu->mouse.left = 0; menu->mouse.left = 0;
menu->mouse.right = 0; menu->mouse.right = 0;