Changeset a8712a3720567c0b03612d0d93d354bd90f8b138

Show
Ignore:
Timestamp:
04/06/08 17:43:06 (4 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1212594186 +0300
git-parent:

[497087466251d63b5245082c5200f5df21a5af4f]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1212594186 +0300
Message:

Fix sout leak if the playlist is gone

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/input/input.c

    r61ee17a ra8712a3  
    326326            SoutKeep( priv->p_sout ); 
    327327        else 
    328         { 
    329328            sout_DeleteInstance( priv->p_sout ); 
    330             priv->p_sout = NULL; 
    331         } 
    332329    } 
    333330#endif 
    …… 
    14551452    playlist_t * p_playlist = vlc_object_find( p_sout, VLC_OBJECT_PLAYLIST, 
    14561453                                                FIND_PARENT ); 
    1457     if( !p_playlist ) return; 
    1458  
    1459     msg_Dbg( p_sout, "sout has been kept" ); 
    1460     vlc_object_attach( p_sout, p_playlist ); 
    1461  
    1462     vlc_object_release( p_playlist ); 
     1454    if( p_playlist ) 
     1455    { 
     1456        msg_Dbg( p_sout, "sout has been kept" ); 
     1457        vlc_object_attach( p_sout, p_playlist ); 
     1458        vlc_object_release( p_playlist ); 
     1459    } 
     1460    else 
     1461        sout_DeleteInstance( p_sout ); 
    14631462} 
    14641463