Changeset e20319314d0ce591fa4ffa5a5f58a5e51b9f9a37

Show
Ignore:
Timestamp:
26/01/08 07:24:47 (10 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1201328687 +0000
git-parent:

[ef26e8eadbfde35692b36a68d2f746c494cc2d78]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1201328687 +0000
Message:

Qt4 - Fix segfault from previous commit, and read from the config only once and simplify.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/components/playlist/playlist_item.cpp

    ref26e8e re203193  
    5757    assert( model );              /* We need a model */ 
    5858 
    59     /* No parent, should be the main one */ 
     59    /* No parent, should be the 2 main ones */ 
    6060    if( parentItem == NULL ) 
    6161    { 
    62         i_showflags = model->shownFlags(); 
    63         updateColumnHeaders(); 
     62        if( model->i_depth == DEPTH_SEL )  /* Selector Panel */ 
     63        { 
     64            item_col_strings.append( "" ); 
     65        } 
     66        else 
     67        { 
     68            i_showflags = config_GetInt( model->p_intf, "qt-pl-showflags" ); 
     69            updateColumnHeaders(); 
     70        } 
    6471    } 
    6572    else 
    …… 
    6976        item_col_strings.append( "" ); 
    7077    } 
    71     msg_Dbg( model->p_intf, "PLItem created of type: %i", model->i_depth ); 
    7278} 
    7379 
    …… 
    97103{ 
    98104    item_col_strings.clear(); 
    99  
    100     if( model->i_depth == DEPTH_SEL )  /* Selector Panel */ 
    101     { 
    102         item_col_strings.append( "" ); 
    103         return; 
    104     } 
    105105 
    106106    for( int i_index=1; i_index <= VLC_META_ENGINE_ART_URL; i_index *= 2 ) 

  • modules/gui/qt4/components/playlist/playlist_model.hpp

    rc243a82 re203193  
    115115    QStringList mimeTypes() const; 
    116116 
    117     int shownFlags() { return rootItem->i_showflags;  } 
     117    int shownFlags() { return rootItem->i_showflags;  } 
    118118 
    119119private: