Changeset ee0a4d8279e952fa99249e332687e1b6fdc79105

Show
Ignore:
Timestamp:
04/02/08 14:26:56 (5 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1207139216 +0200
git-parent:

[4ce6c3f34b0807c7ee8db8739bdbdb9773d42f56]

git-author:
Rafaël Carré <funman@videolan.org> 1207139216 +0200
Message:

Don't dump/clean media library if it's not active

Bug spotted by Anthony Loiseau

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/playlist/engine.c

    rbf6537c ree0a4d8  
    485485    } 
    486486 
    487     playlist_MLDump( p_playlist ); 
    488  
    489     /* Because this recursive function decreases the 
    490      * p_playlist->p_ml_category refcount, it may get deleted. 
    491      * However we will delete the p_playlist->p_ml_category in the 
    492      * following FOREACH. */ 
    493     vlc_gc_incref( p_playlist->p_ml_category->p_input ); 
    494  
    495     /* We don't need the media library anymore */ 
    496     /* Decref all subitems, and the given items */ 
    497     recursively_decref( p_playlist->p_ml_category ); 
     487    if( config_GetInt( p_playlist, "media-library" ) ) 
     488    { 
     489        playlist_MLDump( p_playlist ); 
     490        /* Because this recursive function decreases the 
     491         * p_playlist->p_ml_category refcount, it may get deleted. 
     492         * However we will delete the p_playlist->p_ml_category in the 
     493         * following FOREACH. */ 
     494        vlc_gc_incref( p_playlist->p_ml_category->p_input ); 
     495 
     496        /* We don't need the media library anymore */ 
     497        /* Decref all subitems, and the given items */ 
     498        recursively_decref( p_playlist->p_ml_category ); 
     499    } 
    498500 
    499501    PL_LOCK;