[vlc-commits] Qt: Fix double activation to enter directories.

Francois Cartegnie git at videolan.org
Sat Sep 15 20:04:54 CEST 2012


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Sep 15 20:03:18 2012 +0200| [0bd66faa655055fdddcee8f3b3d9447496a815d6] | committer: Francois Cartegnie

Qt: Fix double activation to enter directories.

Auto-entering directories could never work because
LeafToParent's event id was playlist's and compared to
last activate input_item id.

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

 modules/gui/qt4/components/playlist/standardpanel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 919309f..35e6117 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -725,7 +725,7 @@ void StandardPLPanel::activate( const QModelIndex &index )
             playlist_Lock( THEPL );
             playlist_item_t *p_item = playlist_ItemGetById( THEPL, model->itemId( index ) );
             p_item->i_flags |= PLAYLIST_SUBITEM_STOP_FLAG;
-            lastActivatedId = p_item->p_input->i_id;
+            lastActivatedId = p_item->i_id;
             playlist_Unlock( THEPL );
             model->activateItem( index );
         }



More information about the vlc-commits mailing list