From 2b062fe557c68890c21f3a722c6b9344b8441865 Mon Sep 17 00:00:00 2001 From: "wonguk.jeong" Date: Tue, 15 Jul 2014 12:09:49 +0900 Subject: [PATCH] list: remove annoying error msg on select Summary: on select below message was shown, ERR<19329>: elm_main.c:1556 elm_object_widget_check() safety check failed: obj == NULL Test Plan: 1. terminology -> options -> keys -> select item -> check error message 2. elementary_test -> list2 -> select topmost item -> check error message Reviewers: raster, cedric, seoz, Hermet Reviewed By: Hermet Subscribers: seoz Differential Revision: https://phab.enlightenment.org/D1185 --- legacy/elementary/src/lib/elm_list.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index ecc09e9131..99aad4d787 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -1325,14 +1325,16 @@ _item_select(Elm_List_Item *it) if (it->base.disabled || (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)) return; - if (!sd->focus_on_selection_enabled && (it->icon || it->end)) + if (!sd->focus_on_selection_enabled) { - if (elm_object_widget_check(it->icon) && elm_object_focus_get(it->icon)) + if (it->icon && elm_object_widget_check(it->icon) && + elm_object_focus_get(it->icon)) { elm_object_focus_set(obj, EINA_FALSE); elm_object_focus_set(obj, EINA_TRUE); } - else if (elm_object_widget_check(it->end) && elm_object_focus_get(it->end)) + else if (it->end && elm_object_widget_check(it->end) && + elm_object_focus_get(it->end)) { elm_object_focus_set(obj, EINA_FALSE); elm_object_focus_set(obj, EINA_TRUE);