From 2cfb1e4c8fe70c9159a33e3874974feba9fe8eac Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sat, 28 Mar 2015 22:53:05 +0100 Subject: [PATCH] (menu) use menu.mouse.enable for enabling/disabling touch controls. --- menu/menu_entries_cbs_iterate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index 876555deae..45280c5cbb 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -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;