discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=808ab6018124797e83314a897b5ee96a1f7df5aa

commit 808ab6018124797e83314a897b5ee96a1f7df5aa
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Mar 10 16:11:57 2015 -0400

    fix invalid eina list usage when merging wl surface frame list
---
 src/bin/e_comp_wl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 4de11c4..4a89e41 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1147,8 +1147,8 @@ _e_comp_wl_surface_state_commit(E_Client *ec, 
E_Comp_Wl_Surface_State *state)
 
    /* insert state frame callbacks into comp_data->frames
     * NB: This clears state->frames list */
-   EINA_LIST_FOREACH(state->frames, l, cb)
-     eina_list_move(&ec->comp_data->frames, &state->frames, cb);
+   ec->comp_data->frames = eina_list_merge(ec->comp_data->frames, 
state->frames);
+   state->frames = NULL;
 
    return;
 

-- 


Reply via email to