[vlc-devel] commit: Revert ef5d32ea57103: hopefully fix a race condition on deactivation ( Jean-Philippe André )
git version control
git at videolan.org
Thu Feb 4 02:01:07 CET 2010
vlc | branch: master | Jean-Philippe André <jpeg at videolan.org> | Wed Feb 3 23:55:57 2010 +0100| [13ca60ed3a07c1e72e606d1b01e304e3ac099ea3] | committer: Jean-Philippe André
Revert ef5d32ea57103: hopefully fix a race condition on deactivation
This was wrong, the fix should not come there.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13ca60ed3a07c1e72e606d1b01e304e3ac099ea3
---
modules/misc/lua/extension_thread.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/modules/misc/lua/extension_thread.c b/modules/misc/lua/extension_thread.c
index 3b1cbd9..638b966 100644
--- a/modules/misc/lua/extension_thread.c
+++ b/modules/misc/lua/extension_thread.c
@@ -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 */
More information about the vlc-devel
mailing list