Test for 0 geometry

mhugent · mhugent · commit ecf66b55591b · 2006-12-27T15:44:05.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6320 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -1392,8 +1392,11 @@ QgsRect QgsVectorLayer::bBoxOfSelected()
   {
     if (mSelectedFeatureIds.find(fet->featureId()) != mSelectedFeatureIds.end())
     {
-      r=fet->geometry()->boundingBox();
-      retval.combineExtentWith(&r);
+      if(fet->geometry())
+	{
+	  r=fet->boundingBox();
+	  retval.combineExtentWith(&r);
+	}
     }
     delete fet;
   }

Original file line number	Diff line number	Diff line change
`@@ -1392,8 +1392,11 @@ QgsRect QgsVectorLayer::bBoxOfSelected()`
`1392`	`1392`	`{`
`1393`	`1393`	`if (mSelectedFeatureIds.find(fet->featureId()) != mSelectedFeatureIds.end())`
`1394`	`1394`	`{`
`1395`		`- r=fet->geometry()->boundingBox();`
`1396`		`- retval.combineExtentWith(&r);`
	`1395`	`+ if(fet->geometry())`
	`1396`	`+ {`
	`1397`	`+ r=fet->boundingBox();`
	`1398`	`+ retval.combineExtentWith(&r);`
	`1399`	`+ }`
`1397`	`1400`	`}`
`1398`	`1401`	`delete fet;`
`1399`	`1402`	`}`