discomfitor pushed a commit to branch master.

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

commit c911ac2fb998b04cb0bb744cc47bcbd656de239b
Author: Mike Blumenkrantz <[email protected]>
Date:   Thu May 8 21:03:53 2014 -0400

    call edje_cc link combining when popping the group so the last group 
doesn't not get linked
---
 src/bin/edje/edje_cc_handlers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 62b00da..394b056 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -2894,8 +2894,6 @@ ob_collections_group(void)
    current_part = NULL;
    current_desc = NULL;
 
-   if (current_de)
-     _link_combine();
 
    current_group_inherit = EINA_FALSE;
 
@@ -11205,6 +11203,8 @@ edje_cc_handlers_pop_notify(const char *token)
      }
    else if (current_program && (!strcmp(token, "link")))
      current_program = NULL;
+   else if (current_de && (!strcmp(token, "group")))
+     _link_combine();
 }
 
 static void

-- 


Reply via email to