Commit 8d103cf3 authored by Bart Cerneels's avatar Bart Cerneels
Browse files

Don't accept drops on non-collectionheader items.

Caused the copy dialog to come up.

BUG: 291068
FIXED-IN: 2.6
parent 73813af3
......@@ -30,6 +30,8 @@ Version 2.6-Beta 1
"1.2 GB free" is shown instead of "85% used"; thicker capacity bar.
BUGFIXES:
* Don't show organize collection when dropping track on non-collection
entry in Collection Browser. (BR 291068)
* Fix scrollarea following keyboard navigation. (BR 259791)
* Fix crash when trying to save custom equalizer presets. (BR 286227)
* Fix crash due to my silly method order error. (BR 291968)
......
......@@ -120,8 +120,12 @@ bool
CollectionTreeItemModel::dropMimeData( const QMimeData *data, Qt::DropAction action, int row,
int column, const QModelIndex &parent )
{
if( !parent.isValid() && row == -1 && column == -1 )
return true; //only droppable on root (collection header) items.
//no drops on empty areas
if( !parent.isValid() )
return false;
if( parent.isValid() && ( row != -1 && column != -1 ) )
return false; //only droppable on root (collection header) items.
CollectionTreeItem *item = static_cast<CollectionTreeItem*>( parent.internalPointer() );
Q_ASSERT(item->type() == CollectionTreeItem::Collection);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment