]> git.sesse.net Git - vlc/commitdiff
Revert ef5d32ea57103: hopefully fix a race condition on deactivation
authorJean-Philippe André <jpeg@videolan.org>
Wed, 3 Feb 2010 22:55:57 +0000 (23:55 +0100)
committerJean-Philippe André <jpeg@videolan.org>
Thu, 4 Feb 2010 00:54:25 +0000 (01:54 +0100)
This was wrong, the fix should not come there.

modules/misc/lua/extension_thread.c

index 3b1cbd973ad8adddcbb24c5c33e65fcb543deb36..638b9669ee2cd44bb56d7a513cde661af68d498a 100644 (file)
@@ -198,11 +198,7 @@ static int RemoveActivated( extensions_manager_t *p_mgr, extension_t *p_ext )
 /** Wait for an extension to finish */
 void WaitForDeactivation( extension_t *p_ext )
 {
-    void *pointer = 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 );
+    vlc_join( p_ext->p_sys->thread, NULL );
 }
 
 /** Push a UI command */