Remove non-sensical condition

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

Regression introduced in 55c6f68897a18e906edebc596c84c2ad43f78f3f.

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 956da8b9bca8a8c81de6a2fa57112c8ce1e0be2c..4f39d027d081fd79ae9495c42a0f4fed1dd6aa85 100644 (file)
--- 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 );