Commit bacc6339 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Do not reload the module bank if the language is overriden

The module bank is now locale-independent, so this was a waste fo time.
parent b2262bc3
...@@ -427,9 +427,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -427,9 +427,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
#if defined( ENABLE_NLS ) \ #if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
# if defined (WIN32) || defined (__APPLE__) # if defined (WIN32) || defined (__APPLE__)
/* This ain't really nice to have to reload the config here but it seems
* the only way to do it. */
if( !var_InheritBool( p_libvlc, "ignore-config" ) ) if( !var_InheritBool( p_libvlc, "ignore-config" ) )
config_LoadConfigFile( p_libvlc, "main" ); config_LoadConfigFile( p_libvlc, "main" );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
...@@ -444,13 +441,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -444,13 +441,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
module_EndBank( p_libvlc, false );
module_InitBank( p_libvlc );
if( !var_InheritBool( p_libvlc, "ignore-config" ) )
config_LoadConfigFile( p_libvlc, "main" );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
} }
free( psz_language ); free( psz_language );
# endif # endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment