]> git.sesse.net Git - vlc/commitdiff
use p_playlist->p_input
authorAntoine Cellerier <dionoea@videolan.org>
Thu, 23 Mar 2006 22:46:18 +0000 (22:46 +0000)
committerAntoine Cellerier <dionoea@videolan.org>
Thu, 23 Mar 2006 22:46:18 +0000 (22:46 +0000)
modules/control/http/http.c

index 82277bbd36e2730d324aa9c2e491e9752b96315d..50c60675f4ccaf0f353db149bbea45338d05caba 100644 (file)
@@ -419,15 +419,11 @@ static void Run( intf_thread_t *p_intf )
         {
             if( p_sys->p_playlist )
             {
-                p_sys->p_input =
-                    vlc_object_find( p_sys->p_playlist,
-                                     VLC_OBJECT_INPUT,
-                                     FIND_CHILD );
+                p_sys->p_input = p_sys->p_playlist->p_input;
             }
         }
-        else if( p_sys->p_input->b_dead )
+        else if( p_sys->p_input->b_dead || p_sys->p_input->b_die )
         {
-            vlc_object_release( p_sys->p_input );
             p_sys->p_input = NULL;
         }