raster pushed a commit to branch master.

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

commit c8a8ee3f5e04e4ca05c145880eda91cdf6e6eb4c
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Fri Aug 22 18:15:19 2014 +0900

    edje fix real part get
    
    fixes CID 1039331
---
 src/lib/edje/edje_load.c | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index c3c6085..fc79336 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1187,24 +1187,27 @@ _edje_object_collect(Edje *ed)
                    int idx = 0;
 
                    rp = _edje_real_part_recursive_get(&ed, eud->part);
-                   if (rp->part->type != EDJE_PART_TYPE_BOX) continue ;
-
-                   children = evas_object_box_children_get(rp->object);
-                   EINA_LIST_FREE(children, child)
-                      if (!evas_object_data_get(child, "\377 edje.box_item"))
-                        {
-                           EINA_LIST_FOREACH(l, ls, search)
-                             {
-                                if (search->type == EDJE_USER_BOX_PACK &&
-                                    search->u.box.child == child &&
-                                    search->part == eud->part /* beauty of 
stringshare ! */)
-                                  {
-                                     search->u.box.index = idx++;
-                                     break;
-                                  }
-                             }
-                           _edje_real_part_box_remove(eud->ed, rp, child);
-                        }
+                   if (rp)
+                     {
+                        if (rp->part->type != EDJE_PART_TYPE_BOX) continue;
+
+                        children = evas_object_box_children_get(rp->object);
+                        EINA_LIST_FREE(children, child)
+                        if (!evas_object_data_get(child, "\377 edje.box_item"))
+                          {
+                             EINA_LIST_FOREACH(l, ls, search)
+                               {
+                                  if (search->type == EDJE_USER_BOX_PACK &&
+                                      search->u.box.child == child &&
+                                      search->part == eud->part /* beauty of 
stringshare ! */)
+                                    {
+                                       search->u.box.index = idx++;
+                                       break;
+                                    }
+                               }
+                             _edje_real_part_box_remove(eud->ed, rp, child);
+                          }
+                     }
                 }
               break;
            case EDJE_USER_TABLE_PACK:

-- 


Reply via email to