summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-12 17:42:28 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 09:57:05 +0900
commite4a440797b04a1738a20f54a075c5f20186e40e0 (patch)
tree7abb23476b8cfd06b766e8d814103de33bef21b9
parent76bc13530a7e6b8725b036a5ab76f890499ef0d6 (diff)
downloadefl-e4a440797b04a1738a20f54a075c5f20186e40e0.tar.gz
ctxpopup: Avoid safety error on call on null obj
See 6aa309ffb80a30ce7049d744f2d5abcc2a70b42c
-rw-r--r--src/lib/elementary/elc_ctxpopup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index f339597e51..22789a72cd 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1094,7 +1094,10 @@ _elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
- elm_object_disabled_set(sd->list ?: sd->content, disabled);
+ if (sd->list)
+ elm_object_disabled_set(sd->list, disabled);
+ else if (sd->content)
+ elm_object_disabled_set(sd->content, disabled);
return EINA_TRUE;
}