Merge pull request #1581 from fr500/master

Prevent mouse/touch from registering if overlays are enabled
This commit is contained in:
Twinaphex 2015-04-04 19:11:12 +02:00
commit e66d0c4f9d
2 changed files with 3 additions and 3 deletions

View File

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

View File

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