Test map canvas pointer already when showing context menu

qgis · Jan 7, 2016 · 1bc2c39 · 1bc2c39
1 parent 36c6283
commit 1bc2c39
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -354,8 +354,9 @@ void QgsDualView::viewWillShowContextMenu( QMenu* menu, const QModelIndex& atInd
   }
 
   QgsVectorLayer* vl = mFilterModel->layer();
-  if ( vl && vl->geometryType() != QGis::NoGeometry )
-  {
+  QgsMapCanvas* canvas = mFilterModel->mapCanvas();
+  if ( canvas && vl && vl->geometryType() != QGis::NoGeometry )
+  {  
     menu->addAction( tr( "Zoom to feature" ), this, SLOT( zoomToCurrentFeature() ) );
   }