From 6516727164bbdc26663aa2d72760682c1308313d Mon Sep 17 00:00:00 2001 From: Leandro Pereira Date: Fri, 21 Dec 2012 17:30:44 +0000 Subject: [PATCH] evas/canvas: Make sure rendering finishes before image_data_set() and image_native_set() SVN revision: 81563 --- src/lib/evas/canvas/evas_object_image.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index aef8c7a32d..62ae5307b3 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -1175,6 +1175,8 @@ _image_data_set(Eo *eo_obj, void *_pd, va_list *list) void *data = va_arg(*list, void *); + evas_render_rendering_wait(obj->layer->evas); + _evas_object_image_cleanup(eo_obj, obj, o); p_data = o->engine_data; if (data) @@ -2215,6 +2217,8 @@ _image_native_surface_set(Eo *eo_obj, void *_pd, va_list *list) Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object_Image *o = _pd; + evas_render_rendering_wait(obj->layer->evas); + _evas_object_image_cleanup(eo_obj, obj, o); if (!obj->layer->evas->engine.func->image_native_set) return; if ((surf) &&