From cec0aa37714a170e96062253bd6239787c67c941 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 21 May 2010 16:50:25 +0000 Subject: [PATCH] segv there in frame queue code. fix. SVN revision: 49107 --- legacy/evas/src/lib/canvas/evas_object_image.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index 109af58569..0c52aebc46 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -961,7 +961,8 @@ evas_object_image_data_set(Evas_Object *obj, void *data) return; MAGIC_CHECK_END(); #ifdef EVAS_FRAME_QUEUING - evas_common_pipe_op_image_flush(o->engine_data); + if (o->engine_data) + evas_common_pipe_op_image_flush(o->engine_data); #endif p_data = o->engine_data; if (data) @@ -1825,8 +1826,10 @@ evas_object_image_colorspace_set(Evas_Object *obj, Evas_Colorspace cspace) #ifdef EVAS_FRAME_QUEUING if (o->cur.cspace != cspace) - if (o->engine_data) - evas_common_pipe_op_image_flush(o->engine_data); + { + if (o->engine_data) + evas_common_pipe_op_image_flush(o->engine_data); + } #endif o->cur.cspace = cspace; @@ -1934,8 +1937,10 @@ evas_object_image_scale_hint_set(Evas_Object *obj, Evas_Image_Scale_Hint hint) MAGIC_CHECK_END(); #ifdef EVAS_FRAME_QUEUING if (o->scale_hint != hint) - if (o->engine_data) - evas_common_pipe_op_image_flush(o->engine_data); + { + if (o->engine_data) + evas_common_pipe_op_image_flush(o->engine_data); + } #endif o->scale_hint = hint; }