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

More guards for disabling pointer support when overlay is active

Browse Source
This commit is contained in:
twinaphex 2015-04-13 17:59:43 +02:00
parent 59ed7f6b37
commit 706da9e1f0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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 || settings->input.overlay_enable) if (!settings->menu.pointer.enable || (settings->input.overlay_enable && driver && driver->overlay))
return 0; return 0;
#if defined(HAVE_XMB) #if defined(HAVE_XMB)
@ -221,13 +221,14 @@ static int pointer_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path, static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
const char *label, unsigned type, unsigned action) const char *label, unsigned type, unsigned action)
{ {
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!menu) if (!menu)
return -1; return -1;
if (!settings->menu.mouse.enable || settings->input.overlay_enable) if (!settings->menu.mouse.enable || (settings->input.overlay_enable && driver && driver->overlay))
{ {
menu->mouse.wheeldown = false; menu->mouse.wheeldown = false;
menu->mouse.wheelup = false; menu->mouse.wheelup = false;