From a349bdc7347f05d2526913c0355a70f4b4d3d20e Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 29 Jan 2013 13:48:15 +0000 Subject: [PATCH] fix edje cache miss SVN revision: 83431 --- ChangeLog | 6 +++++- NEWS | 2 ++ src/lib/edje/edje_cache.c | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a30f66763..d15b4ab22b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,13 @@ +2013-01-29 Carsten Haitzler (The Rasterman) + + * Fix cache miss bug when edje cache hash is null, but cache + list may have entries. + 2013-01-25 Jihoon Kim (jihoon) * edje entry : Remove ecore_imf_context_reset, cursor update in mouse move event because it's useless. * edje entry : move ecore_imf_context_cursor_position_set from mouse down event to mouse up event - 2013-01-24 Sung W. Park (sung_) * Add EVAS_GL_DIRECT_MEM_OPT to enable on-demand fallback memory diff --git a/NEWS b/NEWS index c8b254fd16..0832bdcd08 100644 --- a/NEWS +++ b/NEWS @@ -132,3 +132,5 @@ Fixes: * Fixed x11 error sync issue with ecore_x_image_get() * Fix evas gif loader to return the correct frame duration * Prevent a crash even if an invalid object is swallowed into an edje object. + * Fix cache mise when active edje hash is empty. + diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c index de356b0234..6b891df4a2 100644 --- a/src/lib/edje/edje_cache.c +++ b/src/lib/edje/edje_cache.c @@ -318,7 +318,7 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E if (!_edje_file_hash) { _edje_file_hash = eina_hash_string_small_new(NULL); - goto open_new; + goto find_list; } edf = eina_hash_find(_edje_file_hash, file); @@ -333,7 +333,8 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E edf->references++; goto open; } - + +find_list: EINA_LIST_FOREACH(_edje_file_cache, l, edf) { if (!strcmp(edf->path, file))