From: Enlightenment S. <no-...@en...> - 2011-08-20 10:19:25
|
Log: Evas: When doing eng_output_free, even if there is no Render_Engine, we still want to shutdown common_font & common_image anyway. Author: devilhorns Date: 2011-08-20 03:19:17 -0700 (Sat, 20 Aug 2011) New Revision: 62624 Trac: http://trac.enlightenment.org/e/changeset/62624 Modified: trunk/evas/src/modules/engines/software_x11/evas_engine.c Modified: trunk/evas/src/modules/engines/software_x11/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_x11/evas_engine.c 2011-08-20 07:27:52 UTC (rev 62623) +++ trunk/evas/src/modules/engines/software_x11/evas_engine.c 2011-08-20 10:19:17 UTC (rev 62624) @@ -596,19 +596,18 @@ { Render_Engine *re; - if (!data) return; - - re = (Render_Engine *)data; - #ifdef BUILD_ENGINE_SOFTWARE_XLIB // NOTE: XrmGetDatabase() result is shared per connection, do not free it. // if (re->xrdb) XrmDestroyDatabase(re->xrdb); #endif - re->outbuf_free(re->ob); - evas_common_tilebuf_free(re->tb); - if (re->rects) evas_common_tilebuf_free_render_rects(re->rects); - free(re); + if ((re = (Render_Engine *)data)) + { + re->outbuf_free(re->ob); + evas_common_tilebuf_free(re->tb); + if (re->rects) evas_common_tilebuf_free_render_rects(re->rects); + free(re); + } evas_common_font_shutdown(); evas_common_image_shutdown(); |