fix #3021

jef · jef · commit c07fd4a1db8d · 2010-09-20T18:59:10.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14266 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -218,8 +218,12 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )
   else if ( e->button() == Qt::RightButton )
   {
     QTreeWidgetItem* item = itemAt( e->pos() );
-    if ( item == currentItem() )
+    if ( !item || item == currentItem() )
+    {
+      if ( !item )
+        setCurrentItem( 0 );
       handleRightClickEvent( item, e->globalPos() );
+    }
   }
   QTreeWidget::mousePressEvent( e );
 }                               // contentsMousePressEvent

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,12 @@ void QgsLegend::mousePressEvent( QMouseEvent * e )`
`218`	`218`	`else if ( e->button() == Qt::RightButton )`
`219`	`219`	`{`
`220`	`220`	`QTreeWidgetItem* item = itemAt( e->pos() );`
`221`		`- if ( item == currentItem() )`
	`221`	`+ if ( !item \|\| item == currentItem() )`
	`222`	`+ {`
	`223`	`+ if ( !item )`
	`224`	`+ setCurrentItem( 0 );`
`222`	`225`	`handleRightClickEvent( item, e->globalPos() );`
	`226`	`+ }`
`223`	`227`	`}`
`224`	`228`	`QTreeWidget::mousePressEvent( e );`
`225`	`229`	`} // contentsMousePressEvent`