[vlc-commits] commit: freetype: don't create/ show fontcache dialog if config is upto date (Ilkka Ollakka )

[git at videolan.org]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Mar 31 17:46:50 2010 +0300| [9e3623e0823bd21daa1833822b2e38a307204ff5] | committer: Ilkka Ollakka 

freetype: don't create/show fontcache dialog if config is upto date

This is still blind fix, don't have windows box to test atm. So don't blame
me when it eats your cat and runs to riviera with your money and gf (and free
to revert in those cases). Don't remember if that check works correctly in
windows side.

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

 modules/misc/freetype.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 278e7b4..6ac4534 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -352,10 +352,15 @@ static int Create( vlc_object_t *p_this )
         goto error;
 
 #ifdef WIN32
-    dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_filter,
+    dialog_progress_bar_t *p_dialog = NULL;
+
+    if( !FcConfigUptoDate( NULL ) )
+    {
+        p_dialog = dialog_ProgressCreate( p_filter,
             _("Building font cache"),
             _("Please wait while your font cache is rebuilt.\n"
                 "This should take less than a few minutes."), NULL );
+    }
     char *path = xmalloc( PATH_MAX + 1 );
     /* Fontconfig doesnt seem to know where windows fonts are with
      * current contribs. So just tell default windows font directory