Test map canvas pointer already when showing context menu

mhugent · mhugent · commit 1bc2c392fdef · 2016-01-07T09:10:47.000+01:00
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() ) );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,9 @@ void QgsDualView::viewWillShowContextMenu( QMenu* menu, const QModelIndex& atInd`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`QgsVectorLayer* vl = mFilterModel->layer();`
`357`		`- if ( vl && vl->geometryType() != QGis::NoGeometry )`
`358`		`- {`
	`357`	`+ QgsMapCanvas* canvas = mFilterModel->mapCanvas();`
	`358`	`+ if ( canvas && vl && vl->geometryType() != QGis::NoGeometry )`
	`359`	`+ {`
`359`	`360`	`menu->addAction( tr( "Zoom to feature" ), this, SLOT( zoomToCurrentFeature() ) );`
`360`	`361`	`}`
`361`	`362`