aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2018-10-17 14:26:23 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2018-10-17 14:26:23 +0900
commite9eff6b30ea036ba213909fed07e0f88804f4b28 (patch)
treec8fc50d0ebfd82066955b0faffe3b0b8098ab9a8
parentevas vg: fix memory leak at gradient. (diff)
downloadefl-e9eff6b30ea036ba213909fed07e0f88804f4b28.tar.gz
evas_events: Fix wrong condtion.
Summary: mouse_grabbed should not be less than zero. But use OR instead of AND in the condition, so sometimes mouse_grabbed is -1. Reviewers: woohyun, zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7168
-rw-r--r--src/lib/evas/canvas/evas_events.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 1cb89f4f67..13f2c358bd 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -829,7 +829,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
continue;
}
if (((obj_pdata->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
- (obj_pdata->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
+ (obj_pdata->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
(obj_pdata->mouse_grabbed > 0))
{
obj_pdata->mouse_grabbed--;
@@ -1044,7 +1044,7 @@ _evas_event_source_multi_up_events(Evas_Object_Protected_Data *obj, Evas_Public_
}
if (((obj_pdata->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
- (obj_pdata->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
+ (obj_pdata->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
(obj_pdata->mouse_grabbed > 0))
{
obj_pdata->mouse_grabbed--;