summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJunsuChoi <jsuya.choi@samsung.com>2020-04-27 19:29:47 +0900
committerHermet Park <chuneon.park@samsung.com>2020-04-27 19:29:47 +0900
commit0b28f9df54a7b95d9f5275f23a36c23bc71b6f5a (patch)
tree7353a7d828853d44ced180a3003cb26f6fa41515 /src/lib/elementary
parent4cf59afcc96e7977d8039be289d42e587c607c0e (diff)
efl_ui_image: Fix unnecessary unload of memfile_set.
Summary: In D11392, fixed to call file_unload when doing memfile_set. Therefore, "load,error" callback was called while unloading object that was not loaded when first load with memfile_set. So fix it to avoid unnecessary unloading. Test Plan: {F3871804} cp ./test_imge.c ./efl/ cd efl gcc -o test_image test_image.c -g `pkg-config --cflags --libs elementary` ./test_image Loading image... Async file load failed. Image is ready to show. Reviewers: Hermet, kimcinoo, herb Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D11758
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_image.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 1ba7fe5037..7cb96970b0 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2480,7 +2480,10 @@ elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char
2480 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE; 2480 EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
2481 EFL_UI_IMAGE_DATA_GET(obj, sd); 2481 EFL_UI_IMAGE_DATA_GET(obj, sd);
2482 2482
2483 efl_file_unload(obj); 2483 if (efl_file_loaded_get(obj))
2484 efl_file_unload(obj);
2485 else
2486 _efl_ui_image_file_set_do(obj);
2484 2487
2485 evas_object_image_memfile_set 2488 evas_object_image_memfile_set
2486 (sd->img, (void *)img, size, (char *)format, (char *)key); 2489 (sd->img, (void *)img, size, (char *)format, (char *)key);