From 808ab6018124797e83314a897b5ee96a1f7df5aa Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 10 Mar 2015 16:11:57 -0400 Subject: [PATCH] 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 4de11c436..4a89e41a4 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;