Skip to content

Commit 0693339

Browse files
author
brushtyler
committed
applied patch to fix #699
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13641 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8d2c1f8 commit 0693339

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/app/legend/qgslegend.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,20 +356,23 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
356356

357357
mMousePressedFlag = false;
358358

359-
if ( !mItemBeingMoved )
359+
// move only if we have a valid item and drop place
360+
// otherwise reset the stored values
361+
if ( !mItemBeingMoved || !mDropTarget )
360362
{
363+
mItemBeingMoved = NULL;
364+
mDropTarget = NULL;
361365
return;
362366
}
363367

364368
hideLine();
365369

366-
QTreeWidgetItem *destItem = mDropTarget;
367-
368370
QgsLegendItem* origin = dynamic_cast<QgsLegendItem *>( mItemBeingMoved );
369371
mItemBeingMoved = NULL;
370372
QModelIndex oldIndex = indexFromItem( origin );
371373

372-
QgsLegendItem* dest = dynamic_cast<QgsLegendItem *>( destItem );
374+
QgsLegendItem* dest = dynamic_cast<QgsLegendItem *>( mDropTarget );
375+
mDropTarget = NULL;
373376

374377
// no change?
375378
if ( !dest || !origin || ( dest == origin ) )

0 commit comments

Comments
 (0)