Qt: playlist (Fix #3248) Set model after sorting enabled to prevent sorting immediately

And add a debug msg when sorting happens.

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index a9bef58e5b85e60b6d8dfa1c344c04b76ed20794..455291888b78f5dc2079784380d2c7efcac67e91 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -815,6 +815,8 @@ void PLModel::sort( int column, Qt::SortOrder order )
 
 void PLModel::sort( int i_root_id, int column, Qt::SortOrder order )
 {
+    msg_Dbg( p_intf, "Sorting by column %i, order %i", column, order );
+
     int meta = columnToMeta( column );
     if( meta == COLUMN_END ) return;
 

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index f9bb59fa999e4a0f02a8ccf7da16dd814708de44..dbb19cb65a270e93b271bb28ee69c20c0cdaeb2a 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -295,7 +295,6 @@ void StandardPLPanel::createTreeView()
 {
     /* Create and configure the QTreeView */
     treeView = new QTreeView;
-    treeView->setModel( model );
 
     treeView->setIconSize( QSize( 20, 20 ) );
     treeView->setAlternatingRowColors( true );
@@ -314,6 +313,9 @@ void StandardPLPanel::createTreeView()
     treeView->setDropIndicatorShown( true );
     treeView->setContextMenuPolicy( Qt::CustomContextMenu );
 
+    /* setModel after setSortingEnabled(true), or the model will sort immediately! */
+    treeView->setModel( model );
+
     if( getSettings()->contains( "headerStateV2" ) )
     {
         treeView->header()->restoreState(