raster pushed a commit to branch master.

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

commit 9d9e8ffab5f5939646b3616256cb2ed6de3f170d
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Wed Aug 12 10:45:52 2015 +0900

    evas - handle case where layer->evas is null - don't crash
    
    there seems to be a corner case where obj->layer->evas is null for an
    object. i think during shutdown of a canvas.
    
    @fix
---
 src/lib/evas/include/evas_inline.x | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/evas/include/evas_inline.x 
b/src/lib/evas/include/evas_inline.x
index 29cc7d9..51a7941 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -374,7 +374,7 @@ evas_object_clip_recalc(Evas_Object_Protected_Data *obj)
 static inline void
 evas_object_async_block(Evas_Object_Protected_Data *obj)
 {
-   if ((obj) && (obj->layer))
+   if ((obj) && (obj->layer) && (obj->layer->evas))
      {
         eina_lock_take(&(obj->layer->evas->lock_objects));
         eina_lock_release(&(obj->layer->evas->lock_objects));

-- 


Reply via email to