[vlc-commits] Remove non-sensical condition

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May  9 19:49:41 2012 +0300| [2af549a680ba0fd88b4803d0899b8aed1442a9fb] | 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=2af549a680ba0fd88b4803d0899b8aed1442a9fb
---

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

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 956da8b..4f39d02 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -134,8 +134,8 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
         libvlc_SetExitHandler( p_libvlc, vlc_object_kill, p_intf );
         assert( p_intf->pf_run );
         p_intf->pf_run( p_intf );
+        p_intf->pf_run = NULL;
     }
-    else
 #endif
     /* Run the interface in a separate thread */
     if( p_intf->pf_run
@@ -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 );