[vlc-commits] gui/qt: use vlc_playlist_locker in PLModel::flags

Filip Roséen git at videolan.org
Wed Jul 20 16:15:54 CEST 2016


vlc | branch: master | Filip Roséen <filip at videolabs.io> | Wed Jul 20 04:36:54 2016 +0200| [30a0e18aabafb5ea4fab8bf374b4e330581b3c65] | committer: Jean-Baptiste Kempf

gui/qt: use vlc_playlist_locker in PLModel::flags

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt/components/playlist/playlist_model.cpp |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt/components/playlist/playlist_model.cpp b/modules/gui/qt/components/playlist/playlist_model.cpp
index e9f0c52..b4bcd6d 100644
--- a/modules/gui/qt/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt/components/playlist/playlist_model.cpp
@@ -85,15 +85,13 @@ Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
 
     if( canEdit() )
     {
-        PL_LOCK;
+        vlc_playlist_locker pl_lock ( THEPL );
+
         playlist_item_t *plItem =
             playlist_ItemGetById( p_playlist, item->i_playlist_id );
 
         if ( plItem && ( plItem->i_children > -1 ) )
             flags |= Qt::ItemIsDropEnabled;
-
-        PL_UNLOCK;
-
     }
     flags |= Qt::ItemIsDragEnabled;
 



More information about the vlc-commits mailing list