[vlc-commits] freetype: fix cache/fontselect delete order

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Aug 18 14:51:40 2020 +0200| [7a3fc5ba3d2a6b952b49b63aaa8500c1607a7d76] | committer: Francois Cartegnie

freetype: fix cache/fontselect delete order

Win32 still make calls to directwrite

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7a3fc5ba3d2a6b952b49b63aaa8500c1607a7d76
---

 modules/text_renderer/freetype/freetype.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index a5f34547c3..5ebc5e562f 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -1481,9 +1481,6 @@ static void Destroy( vlc_object_t *p_this )
         free( p_sys->pp_font_attachments );
     }
 
-    if(p_sys->fs)
-        FontSelectDelete( p_sys->fs );
-
     /* Freetype */
     if( p_sys->p_stroker )
         FT_Stroker_Done( p_sys->p_stroker );
@@ -1491,6 +1488,9 @@ static void Destroy( vlc_object_t *p_this )
     if( p_sys->ftcache )
         vlc_ftcache_Delete( p_sys->ftcache );
 
+    if( p_sys->fs )
+        FontSelectDelete( p_sys->fs );
+
     FT_Done_FreeType( p_sys->p_library );
 
     free( p_sys );