Merge pull request #98 from lynxlynxlynx/master

mhugent · mhugent · commit 46f208fc22be · 2012-02-17T23:18:58.000-08:00
a crash fix and a tiny cleanup
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -226,7 +226,6 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
       }
       else // polygon
       {
-        QgsGeometry *g;
         if ( layerWKBType == QGis::WKBPolygon ||  layerWKBType == QGis::WKBPolygon25D )
         {
           g = QgsGeometry::fromPolygon( QgsPolygon() << points().toVector() );
@@ -242,6 +241,11 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
           return; //unknown wkbtype
         }
 
+        if ( !g )
+        {
+          stopCapturing();
+          return; // invalid geometry; one possibility is from duplicate points
+        }
         f->setGeometry( g );
 
         int avoidIntersectionsReturn = f->geometry()->avoidIntersections();

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,6 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`226`	`226`	`}`
`227`	`227`	`else // polygon`
`228`	`228`	`{`
`229`		`- QgsGeometry *g;`
`230`	`229`	`if ( layerWKBType == QGis::WKBPolygon \|\| layerWKBType == QGis::WKBPolygon25D )`
`231`	`230`	`{`
`232`	`231`	`g = QgsGeometry::fromPolygon( QgsPolygon() << points().toVector() );`
`@@ -242,6 +241,11 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`242`	`241`	`return; //unknown wkbtype`
`243`	`242`	`}`
`244`	`243`
	`244`	`+ if ( !g )`
	`245`	`+ {`
	`246`	`+ stopCapturing();`
	`247`	`+ return; // invalid geometry; one possibility is from duplicate points`
	`248`	`+ }`
`245`	`249`	`f->setGeometry( g );`
`246`	`250`
`247`	`251`	`int avoidIntersectionsReturn = f->geometry()->avoidIntersections();`