summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_list.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index ecc09e913..99aad4d78 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1325,14 +1325,16 @@ _item_select(Elm_List_Item *it)
1325 1325
1326 if (it->base.disabled || (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)) 1326 if (it->base.disabled || (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))
1327 return; 1327 return;
1328 if (!sd->focus_on_selection_enabled && (it->icon || it->end)) 1328 if (!sd->focus_on_selection_enabled)
1329 { 1329 {
1330 if (elm_object_widget_check(it->icon) && elm_object_focus_get(it->icon)) 1330 if (it->icon && elm_object_widget_check(it->icon) &&
1331 elm_object_focus_get(it->icon))
1331 { 1332 {
1332 elm_object_focus_set(obj, EINA_FALSE); 1333 elm_object_focus_set(obj, EINA_FALSE);
1333 elm_object_focus_set(obj, EINA_TRUE); 1334 elm_object_focus_set(obj, EINA_TRUE);
1334 } 1335 }
1335 else if (elm_object_widget_check(it->end) && elm_object_focus_get(it->end)) 1336 else if (it->end && elm_object_widget_check(it->end) &&
1337 elm_object_focus_get(it->end))
1336 { 1338 {
1337 elm_object_focus_set(obj, EINA_FALSE); 1339 elm_object_focus_set(obj, EINA_FALSE);
1338 elm_object_focus_set(obj, EINA_TRUE); 1340 elm_object_focus_set(obj, EINA_TRUE);