[vlc-devel] commit: Qt4: playlist Item MUST inherit from their parent the show flags on update. ( Jean-Baptiste Kempf )

git version control git at videolan.org
Sun Sep 21 20:44:38 CEST 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Sep 21 11:45:44 2008 -0700| [3519bb1d530743f6d94839e005e3c65ca046df64] | committer: Jean-Baptiste Kempf 

Qt4: playlist Item MUST inherit from their parent the show flags on update.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3519bb1d530743f6d94839e005e3c65ca046df64
---

 .../gui/qt4/components/playlist/playlist_item.cpp  |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp
index bebc324..71f3fd0 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -64,6 +64,7 @@ void PLItem::init( int _i_id, int _i_input_id, PLItem *parent, PLModel *m, QSett
     {
         if( model->i_depth == DEPTH_SEL )  /* Selector Panel */
         {
+            i_showflags = 0;
             item_col_strings.append( "" );
         }
         else
@@ -185,7 +186,7 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
         return;
     }
 
-    assert( i_showflags < COLUMN_END );
+    i_showflags = parentItem ? parentItem->i_showflags : i_showflags;
 
     /* Meta: ID */
     if( i_showflags & COLUMN_NUMBER )
@@ -204,3 +205,4 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
         }
     }
 }
+




More information about the vlc-devel mailing list