summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLeandro Pereira <leandro@profusion.mobi>2012-12-21 17:30:44 +0000
committerLeandro Pereira <leandro@profusion.mobi>2012-12-21 17:30:44 +0000
commit6516727164bbdc26663aa2d72760682c1308313d (patch)
treec235895e354ccdaf528fc745316761d9b3e47d0b /src
parentcafaecfce11485955f76d09b534b60f27578fd57 (diff)
evas/canvas: Make sure rendering finishes before image_data_set() and image_native_set()
SVN revision: 81563
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
1 files changed, 4 insertions, 0 deletions
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)
1175 1175
1176 void *data = va_arg(*list, void *); 1176 void *data = va_arg(*list, void *);
1177 1177
1178 evas_render_rendering_wait(obj->layer->evas);
1179
1178 _evas_object_image_cleanup(eo_obj, obj, o); 1180 _evas_object_image_cleanup(eo_obj, obj, o);
1179 p_data = o->engine_data; 1181 p_data = o->engine_data;
1180 if (data) 1182 if (data)
@@ -2215,6 +2217,8 @@ _image_native_surface_set(Eo *eo_obj, void *_pd, va_list *list)
2215 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 2217 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2216 Evas_Object_Image *o = _pd; 2218 Evas_Object_Image *o = _pd;
2217 2219
2220 evas_render_rendering_wait(obj->layer->evas);
2221
2218 _evas_object_image_cleanup(eo_obj, obj, o); 2222 _evas_object_image_cleanup(eo_obj, obj, o);
2219 if (!obj->layer->evas->engine.func->image_native_set) return; 2223 if (!obj->layer->evas->engine.func->image_native_set) return;
2220 if ((surf) && 2224 if ((surf) &&