Commit 13ca60ed authored by Jean-Philippe André's avatar Jean-Philippe André

Revert ef5d32ea: hopefully fix a race condition on deactivation

This was wrong, the fix should not come there.
parent 7126c75f
...@@ -198,11 +198,7 @@ static int RemoveActivated( extensions_manager_t *p_mgr, extension_t *p_ext ) ...@@ -198,11 +198,7 @@ static int RemoveActivated( extensions_manager_t *p_mgr, extension_t *p_ext )
/** Wait for an extension to finish */ /** Wait for an extension to finish */
void WaitForDeactivation( extension_t *p_ext ) void WaitForDeactivation( extension_t *p_ext )
{ {
void *pointer = NULL; vlc_join( p_ext->p_sys->thread, NULL );
vlc_mutex_lock( &p_ext->p_sys->command_lock );
vlc_cond_signal( &p_ext->p_sys->wait );
vlc_mutex_unlock( &p_ext->p_sys->command_lock );
vlc_join( p_ext->p_sys->thread, &pointer );
} }
/** Push a UI command */ /** Push a UI command */
......
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