(menu) use menu.mouse.enable for enabling/disabling touch controls.

This commit is contained in:
aliaspider 2015-03-28 22:53:05 +01:00
parent 7959111d2a
commit 2cfb1e4c8f

View File

@ -154,6 +154,7 @@ static int pointer_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
const char *label, unsigned type, unsigned action)
{
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
#if defined(HAVE_XMB) || defined(HAVE_GLUI)
driver_t *driver = driver_get_ptr();
#endif
@ -161,6 +162,9 @@ static int pointer_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
if (!menu)
return -1;
if (!settings->menu.mouse.enable)
return 0;
#if defined(HAVE_XMB)
if (driver->menu_ctx == &menu_ctx_xmb)
return 0;
@ -650,6 +654,9 @@ static int pointer_iterate(unsigned *action)
if (!menu)
return -1;
if (!settings->menu.mouse.enable)
return 0;
#if defined(HAVE_XMB)
if (driver->menu_ctx == &menu_ctx_xmb)
return 0;