summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-30 18:46:48 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-30 18:46:48 +0100
commit4098515779869ce121374c98c82947aeda7436ba (patch)
tree2907f92db0cd21cf885c4cad7879cc3682d20083
parent119d9f39dd9ba67068a6abb77990ea859d4266f6 (diff)
evas load - dont lose skip flg update after async head skip load fix
119d9f39dd9ba67068a6abb77990ea859d4266f6 fixed async loads when head skip was on but it broke informing the evas image object of the file handles etc. by losing the skip head flag in the image entry. this fixes that
-rw-r--r--src/lib/evas/cache/evas_cache_image.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index 747fcf9c89..f4921ef196 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -863,6 +863,7 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file,
863 struct stat st; 863 struct stat st;
864 Image_Timestamp tstamp; 864 Image_Timestamp tstamp;
865 Evas_Image_Load_Opts tlo; 865 Evas_Image_Load_Opts tlo;
866 Eina_Bool skip = lo->skip_head;
866 867
867 if (!file) 868 if (!file)
868 { 869 {
@@ -884,7 +885,7 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file,
884 size += key_length; 885 size += key_length;
885 size += _evas_cache_image_loadopts_append(hkey + size, &lo); 886 size += _evas_cache_image_loadopts_append(hkey + size, &lo);
886 tlo = *lo; 887 tlo = *lo;
887 tlo.skip_head = lo->skip_head; 888 tlo.skip_head = skip;
888 889
889 /* find image by key in active hash */ 890 /* find image by key in active hash */
890 SLKL(engine_lock); 891 SLKL(engine_lock);