cedric pushed a commit to branch master.

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

commit e9e91e8a416ce0f57d99c22d5f27a9935b2eb28d
Author: WooHyun Jung <wh0705.j...@samsung.com>
Date:   Mon Sep 21 22:53:35 2015 +0200

    edje_cache: remove duplicated call of _edje_file_coll_open
    
    Summary:
    _edje_file_coll_open will be executed after _edje_file_open is finished.
    This duplicatated call will increase the reference counter and give failure
    of _edje_cache_coll_unref.
    
    @fix
    
    Reviewers: cedric, raster, Hermet
    
    Subscribers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D3075
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/lib/edje/edje_cache.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c
index 10fa3fa..c7fd208 100644
--- a/src/lib/edje/edje_cache.c
+++ b/src/lib/edje/edje_cache.c
@@ -319,16 +319,6 @@ _edje_file_open(const Eina_File *f, const char *coll, int 
*error_ret, Edje_Part_
      if (cc->name)
        eina_hash_direct_add(edf->color_hash, cc->name, cc);
 
-   if (coll)
-     {
-        edc = _edje_file_coll_open(edf, coll);
-        if (!edc)
-          {
-             *error_ret = EDJE_LOAD_ERROR_UNKNOWN_COLLECTION;
-          }
-        if (edc_ret) *edc_ret = edc;
-     }
-
    return edf;
 }
 

-- 


Reply via email to