hermet pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=cad2ce7980a6b9efdd7b134a04bf15f1bcad33f0

commit cad2ce7980a6b9efdd7b134a04bf15f1bcad33f0
Author: wonguk.jeong <[email protected]>
Date:   Tue Jul 15 12:09:49 2014 +0900

    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
---
 src/lib/elm_list.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index ecc09e9..99aad4d 100644
--- a/src/lib/elm_list.c
+++ b/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);

-- 


Reply via email to