From 59bf99eda26c29eba326c7850ab462fae027b02e Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Wed, 26 Oct 2016 10:54:58 -0400 Subject: [PATCH] ecore-wl2: Ensure we remove the proper pointer frame callback During the pointer frame callback, if we had a 'callback' but did not have an input->cursor.frame_cb then we would have ended up deleting the callback here anyway. Let's add a comparison of the callback to the pointer frame callback to ensure we are removing the proper callback. @fix Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c index 909cc5fa1a..8a0376baaf 100644 --- a/src/lib/ecore_wl2/ecore_wl2_input.c +++ b/src/lib/ecore_wl2/ecore_wl2_input.c @@ -666,7 +666,8 @@ _pointer_cb_frame(void *data, struct wl_callback *callback, unsigned int timesta if (callback) { - if (callback != input->cursor.frame_cb) return; + if ((input->cursor.frame_cb) && + (callback != input->cursor.frame_cb)) return; wl_callback_destroy(callback); input->cursor.frame_cb = NULL; }