[vlc-commits] Remove non-sensical condition

Rémi Denis-Courmont git at videolan.org
Wed May 9 18:53:09 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May  9 19:49:41 2012 +0300| [f47484d07e331bd90bb2fa1068f10e0dd485c1d7] | committer: Rémi Denis-Courmont

Remove non-sensical condition

If a thread can be cancelled, it can be joined.

Regression introduced in 55c6f68897a18e906edebc596c84c2ad43f78f3f.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f47484d07e331bd90bb2fa1068f10e0dd485c1d7
---

 src/interface/interface.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 956da8b..0a742d7 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -189,9 +189,6 @@ void intf_DestroyAll( libvlc_int_t *p_libvlc )
         if( p_intf->pf_run )
         {
             vlc_cancel( p_intf->thread );
-#ifdef __APPLE__
-            if (!p_intf->b_should_run_on_first_thread)
-#endif
             vlc_join( p_intf->thread, NULL );
         }
         module_unneed( p_intf, p_intf->p_module );



More information about the vlc-commits mailing list