fix699.diff
| src/app/legend/qgslegend.cpp (working copy) | ||
|---|---|---|
| 356 | 356 | |
| 357 | 357 |
mMousePressedFlag = false; |
| 358 | 358 | |
| 359 |
if ( !mItemBeingMoved ) |
|
| 359 |
// move only if we have a valid item and drop place |
|
| 360 |
// otherwise reset the stored values, to fix #699 |
|
| 361 |
if ( !mItemBeingMoved || !mDropTarget ) |
|
| 360 | 362 |
{
|
| 363 |
mItemBeingMoved = NULL; |
|
| 364 |
mDropTarget = NULL; |
|
| 361 | 365 |
return; |
| 362 | 366 |
} |
| 363 | 367 | |
| 364 | 368 |
hideLine(); |
| 365 | 369 | |
| 366 |
QTreeWidgetItem *destItem = mDropTarget; |
|
| 367 | ||
| 368 | 370 |
QgsLegendItem* origin = dynamic_cast<QgsLegendItem *>( mItemBeingMoved ); |
| 369 | 371 |
mItemBeingMoved = NULL; |
| 370 | 372 |
QModelIndex oldIndex = indexFromItem( origin ); |
| 371 | 373 | |
| 372 |
QgsLegendItem* dest = dynamic_cast<QgsLegendItem *>( destItem ); |
|
| 374 |
QgsLegendItem* dest = dynamic_cast<QgsLegendItem *>( mDropTarget ); |
|
| 375 |
mDropTarget = NULL; |
|
| 373 | 376 | |
| 374 | 377 |
// no change? |
| 375 | 378 |
if ( !dest || !origin || ( dest == origin ) ) |