Commit e9b987f4 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

libvlccore: Don't attempt to use vlc_thread_set_priority() before the config are initialized.

This fixes a crash on Mac OS X.
parent 80206750
......@@ -208,9 +208,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
/* Initialize mutexes */
vlc_mutex_init( &priv->timer_lock );
vlc_mutex_init( &priv->config_lock );
#ifdef __APPLE__
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
/* Store data for the non-reentrant API */
p_static_vlc = p_libvlc;
......@@ -281,6 +279,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
return VLC_EGENERIC;
}
#ifdef __APPLE__
/* vlc_thread_set_priority needs to query the config,
* so this is the earliest moment where we can set this */
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
/* Check for short help option */
if( config_GetInt( p_libvlc, "help" ) > 0 )
{
......
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