Evas: When doing eng_output_free, even if there is no Render_Engine,

we still want to shutdown common_font & common_image anyway.



SVN revision: 62624
This commit is contained in:
Christopher Michael 2011-08-20 10:19:17 +00:00
parent 64aa704c69
commit 6c477d5a0f
1 changed files with 7 additions and 8 deletions

View File

@ -596,19 +596,18 @@ eng_output_free(void *data)
{
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();