Commit 7b07426b authored by Clément Stenac's avatar Clément Stenac

Hopefully fix locking issues with wx

parent 43fed3cc
...@@ -129,7 +129,9 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) ...@@ -129,7 +129,9 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
if( p_playlist ) if( p_playlist )
{ {
val.i_int = p_playlist->i_index; val.i_int = p_playlist->i_index;
vlc_mutex_unlock( &p_input->stream.stream_lock );
var_Set( p_playlist, "item-change", val ); var_Set( p_playlist, "item-change", val );
vlc_mutex_lock( &p_input->stream.stream_lock );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
...@@ -205,7 +207,9 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) ...@@ -205,7 +207,9 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
if( p_playlist ) if( p_playlist )
{ {
val.i_int = p_playlist->i_index; val.i_int = p_playlist->i_index;
vlc_mutex_unlock( &p_input->stream.stream_lock );
var_Set( p_playlist, "item-change", val ); var_Set( p_playlist, "item-change", val );
vlc_mutex_lock( &p_input->stream.stream_lock );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
......
...@@ -184,7 +184,10 @@ void playlist_Command( playlist_t * p_playlist, playlist_command_t i_command, ...@@ -184,7 +184,10 @@ void playlist_Command( playlist_t * p_playlist, playlist_command_t i_command,
{ {
input_StopThread( p_playlist->p_input ); input_StopThread( p_playlist->p_input );
val.i_int = p_playlist->i_index; val.i_int = p_playlist->i_index;
/* Does not matter if we unlock here */
vlc_mutex_unlock( &p_playlist->object_lock );
var_Set( p_playlist, "item-change",val ); var_Set( p_playlist, "item-change",val );
vlc_mutex_lock( &p_playlist->object_lock );
} }
break; break;
......
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