devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=db63eff588c2e6f606c6159e540216f811d4e688
commit db63eff588c2e6f606c6159e540216f811d4e688
Author: Chris Michael <cp.mich...@samsung.com>
Date: Tue Oct 25 13:10:21 2016 -0400
ecore-wl2: Don't call cursor_update_stop function twice.
When setting a cursor by name, the _ecore_wl2_input_cursor_set
function already makes a call to stop updating the cursor, so no need
to run that twice.
@fix
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/ecore_wl2/ecore_wl2_window.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c
b/src/lib/ecore_wl2/ecore_wl2_window.c
index cd796e9..31cf199 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -950,8 +950,7 @@ ecore_wl2_window_pointer_set(Ecore_Wl2_Window *window,
struct wl_surface *surfac
_ecore_wl2_input_cursor_update_stop(input);
if (input->wl.pointer)
- wl_pointer_set_cursor(input->wl.pointer,
- input->pointer.enter_serial,
+ wl_pointer_set_cursor(input->wl.pointer, input->pointer.enter_serial,
surface, hot_x, hot_y);
}
@@ -967,7 +966,6 @@ ecore_wl2_window_cursor_from_name_set(Ecore_Wl2_Window
*window, const char *curs
input = ecore_wl2_window_input_get(window);
if (!input) return;
- _ecore_wl2_input_cursor_update_stop(input);
_ecore_wl2_input_cursor_set(input, cursor);
}
--
