summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-04-04 10:28:45 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-04-04 10:34:13 +0900
commitf8fbb5abc29e84f313cb0305d004e08bcdae1bb4 (patch)
tree4396f455dda0984d37156e8be0093c7795edf3fc
parentb9480fc7d8661d44b1ecda9bb07a1be50454741d (diff)
Evas cserve2: Fix crash in elm_test GLView
This whole cache/cache2 API duplication is a complete mess. This was a @fix (forgot the tag in master). (cherry picked from commit 0e1b52875dcdd0a195fbbc5f0dd90a1daa396f68)
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 1017ba2166..95fb144c79 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -934,6 +934,11 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, void *native)
934 if (im->references > 1) 934 if (im->references > 1)
935 ERR("Setting native with more than one references for im=%p", im); 935 ERR("Setting native with more than one references for im=%p", im);
936 936
937#ifdef EVAS_CSERVE2
938 if (evas_cserve2_use_get() && evas_cache2_image_cached(im))
939 evas_cache2_image_close(im);
940 else
941#endif
937 evas_cache_image_drop(im); 942 evas_cache_image_drop(im);
938 943
939 return im2; 944 return im2;