From dd68808a429f32c38a6d9be9ea83d2e1ad84f8c9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 15 Nov 2014 16:17:57 +0100 Subject: [PATCH] Revert order for drop types. --- src/tomahawk/sourcetree/SourceTreeView.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/tomahawk/sourcetree/SourceTreeView.cpp b/src/tomahawk/sourcetree/SourceTreeView.cpp index a6acbfff9..2634aff06 100644 --- a/src/tomahawk/sourcetree/SourceTreeView.cpp +++ b/src/tomahawk/sourcetree/SourceTreeView.cpp @@ -774,10 +774,15 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event ) { QTreeView::dragMoveEvent( event ); - bool accept = false; - - if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track, DropJob::Append ) ) + if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) { + // Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally + event->setDropAction( Qt::CopyAction ); + event->accept(); + } + else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track, DropJob::Append ) ) + { + bool accept = false; setDirtyRegion( m_dropRect ); const QPoint pos = event->pos(); const QModelIndex index = indexAt( pos ); @@ -835,13 +840,6 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event ) event->setDropAction( Qt::CopyAction ); event->accept(); } - else if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) - { - // Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally - event->setDropAction( Qt::CopyAction ); - event->accept(); - return; - } setDirtyRegion( m_dropRect ); }