From 062145b605acdc05a6f37599e97d391f11d9fcc3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 30 Aug 2016 11:04:31 +0900 Subject: [PATCH] win: Fix ERR message with object,focus,in enventor exhibits this issue, where the focus target is NULL in some cases. The ERR message was harmless, but it's good to avoid it and be explicit that the object should be non NULL when adding event callbacks. --- src/lib/elementary/efl_ui_win.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 76d0762..2c84249 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2308,13 +2308,16 @@ _elm_win_object_focus_in(void *data, target = _elm_win_focus_target_get(obj); sd->focus_highlight.cur.target = target; - if (target && elm_widget_highlight_in_theme_get(target)) - sd->focus_highlight.cur.in_theme = EINA_TRUE; - else - _elm_win_focus_target_callbacks_add(sd); - evas_object_event_callback_add - (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); + if (target) + { + if (elm_widget_highlight_in_theme_get(target)) + sd->focus_highlight.cur.in_theme = EINA_TRUE; + else + _elm_win_focus_target_callbacks_add(sd); + evas_object_event_callback_add + (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj); + } _elm_win_focus_highlight_reconfigure_job_start(sd); } -- 2.7.4