[vlc-commits] commit: Libass: put the dialog, where we actually need it. ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 27 00:48:53 2010 +0200| [7c3509526df9ccabfdb0f7dac24f7b49e34b726d] | committer: Jean-Baptiste Kempf 

Libass: put the dialog, where we actually need it.
(cherry picked from commit 53e01409044d83633696e4e1fab0fccc06737b84)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/libass.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index ae36eac..dbd5fde 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -698,15 +698,6 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     }
     free( pp_attachments );
 
-#if defined(WIN32)
-    dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_dec,
-        _("Building font cache"),
-        _( "Please wait while your font cache is rebuilt.\n"
-        "This should take less than a minute." ), NULL );
-    if( p_dialog )
-        dialog_ProgressSet( p_dialog, NULL, 0.1 );
-#endif
-
     ass_set_extract_fonts( p_library, true );
     ass_set_style_overrides( p_library, NULL );
 
@@ -726,7 +717,11 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
 
 #ifdef HAVE_FONTCONFIG
-#ifdef WIN32
+#if defined(WIN32)
+    dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_dec,
+        _("Building font cache"),
+        _( "Please wait while your font cache is rebuilt.\n"
+        "This should take less than a minute." ), NULL );
     if( p_dialog )
         dialog_ProgressSet( p_dialog, NULL, 0.2 );
 #endif