From 1f6fb814b2db702eedf69610e431f7b3eed28b11 Mon Sep 17 00:00:00 2001 From: iive Date: Mon, 15 Nov 2004 15:29:39 +0000 Subject: [PATCH] free freetype descriptor and library and mconfig data right before exit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13957 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mplayer.c b/mplayer.c index 2d947f56b6..872e0f05d2 100644 --- a/mplayer.c +++ b/mplayer.c @@ -483,8 +483,18 @@ static void exit_player_with_rc(char* how, int rc){ vo_uninit(); // close the X11 connection (if any opened) #endif +#ifdef HAVE_FREETYPE + current_module="uninit_font"; + if (vo_font) free_font_desc(vo_font); + vo_font = NULL; + done_freetype(); +#endif + current_module="exit_player"; +// free mplayer config + free(mconfig); + #ifdef USE_EDL if(edl_records != NULL) free(edl_records); // free mem allocated for EDL #endif @@ -4129,12 +4139,6 @@ if(use_gui || playtree_iter != NULL){ goto play_next_file; } -#ifdef HAVE_FREETYPE -current_module="uninit_font"; -if (vo_font) free_font_desc(vo_font); -vo_font = NULL; -done_freetype(); -#endif exit_player_with_rc(MSGTR_Exit_eof, 0);