vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Mar 29 18:37:22 2017 +0200| [6e266f5e8f29f4c2755a3d80224c38815b05d662] | committer: Hugo Beauzée-Luyssen
lua: Don't attempt to deactivate the extension when killing it. As the extension thread is holding the lock, and stuck while the lua function is executing, when a timeout is detected, there's no way to acquire the lock, not to execute the deactivate function in a thread safe manner. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e266f5e8f29f4c2755a3d80224c38815b05d662 --- modules/lua/extension_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lua/extension_thread.c b/modules/lua/extension_thread.c index 1b6b0f2..92077b2 100644 --- a/modules/lua/extension_thread.c +++ b/modules/lua/extension_thread.c @@ -166,7 +166,7 @@ int Deactivate( extensions_manager_t *p_mgr, extension_t *p_ext ) void KillExtension( extensions_manager_t *p_mgr, extension_t *p_ext ) { msg_Dbg( p_mgr, "Killing extension now" ); - lua_ExtensionDeactivate( p_mgr, p_ext ); + vlclua_fd_interrupt( &p_ext->p_sys->dtable ); vlc_mutex_lock( &p_ext->p_sys->command_lock ); p_ext->p_sys->b_activated = false; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
