summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_image.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-10-09 13:34:23 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-10-09 13:34:23 +0100
commit0c79b8f94b7e27df1bfd559daf5ee3c6b4ac7c81 (patch)
tree448cd55d75e9d095a4b467a2f51f2a13c403a423 /src/lib/elementary/efl_ui_image.c
parenteacee53c2e795a1c5e187558ccced2d66390d761 (diff)
efl ui image - dont cancel preload on image if image is an edje object
fixes invalid request on non-image object. @fix
Diffstat (limited to 'src/lib/elementary/efl_ui_image.c')
-rw-r--r--src/lib/elementary/efl_ui_image.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 9e91dd7ac0..4156728027 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -937,7 +937,7 @@ _efl_ui_image_efl_file_load(Eo *obj, Efl_Ui_Image_Data *sd)
937 _async_cancel(sd); 937 _async_cancel(sd);
938 938
939 /* stop preloading as it may hit to-be-freed memory */ 939 /* stop preloading as it may hit to-be-freed memory */
940 if (sd->img && sd->preload_status == EFL_UI_IMAGE_PRELOADING) 940 if ((sd->img) && (sd->preload_status == EFL_UI_IMAGE_PRELOADING) && (!sd->edje))
941 evas_object_image_preload(sd->img, EINA_TRUE); 941 evas_object_image_preload(sd->img, EINA_TRUE);
942 942
943 if (sd->remote.copier) _efl_ui_image_remote_copier_cancel(obj, sd); 943 if (sd->remote.copier) _efl_ui_image_remote_copier_cancel(obj, sd);