discomfitor pushed a commit to branch enlightenment-0.20.

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

commit b978485453655268700703f9471a2089848e0dab
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Jan 14 15:03:37 2016 -0500

    allow NULL object in e_comp_object_util_autoclose()
    
    this can be used to unset the current autoclose object in the case
    where the object is known to evade normal autoclose detection
    mechanisms
---
 src/bin/e_comp_object.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 0332c81..b1a699f 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -4127,14 +4127,13 @@ _e_comp_object_autoclose_del(void *data EINA_UNUSED, 
Evas *e EINA_UNUSED, Evas_O
 E_API void
 e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb 
del_cb, E_Comp_Object_Key_Cb cb, const void *data)
 {
-   SOFT_ENTRY();
-
    if (e_comp->autoclose.obj)
      {
         if (e_comp->autoclose.obj == obj) return;
         evas_object_event_callback_del_full(e_comp->autoclose.obj, 
EVAS_CALLBACK_DEL, _e_comp_object_autoclose_del, e_comp);
         _e_comp_object_autoclose_cleanup(0);
      }
+   if (!obj) return;
    e_comp->autoclose.obj = obj;
    e_comp->autoclose.del_cb = del_cb;
    e_comp->autoclose.key_cb = cb;

-- 


Reply via email to