jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e4a440797b04a1738a20f54a075c5f20186e40e0

commit e4a440797b04a1738a20f54a075c5f20186e40e0
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue Sep 12 17:42:28 2017 +0900

    ctxpopup: Avoid safety error on call on null obj
    
    See 6aa309ffb80a30ce7049d744f2d5abcc2a70b42c
---
 src/lib/elementary/elc_ctxpopup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;
 }

-- 


Reply via email to