Fix Coverity unchecked return value error

nyalldawson · nyalldawson · commit 3c5f30b61549 · 2017-04-30T09:21:45.000+10:00
diff --git a/src/app/nodetool/qgsnodetool.cpp b/src/app/nodetool/qgsnodetool.cpp
@@ -1558,12 +1558,14 @@ void QgsNodeTool::deleteVertex()
         for ( int i = 0; i < vertexIds.count(); ++i )
         {
           QgsVertexId vid;
-          geom.vertexIdFromVertexNr( vertexIds[i], vid );
-          int ringVertexCount = geom.geometry()->vertexCount( vid.part, vid.ring );
-          if ( vid.vertex == ringVertexCount - 1 )
+          if ( geom.vertexIdFromVertexNr( vertexIds[i], vid ) )
           {
-            // this is the last vertex of the ring - remove the first vertex from the list
-            duplicateVertexIndices << geom.vertexNrFromVertexId( QgsVertexId( vid.part, vid.ring, 0 ) );
+            int ringVertexCount = geom.geometry()->vertexCount( vid.part, vid.ring );
+            if ( vid.vertex == ringVertexCount - 1 )
+            {
+              // this is the last vertex of the ring - remove the first vertex from the list
+              duplicateVertexIndices << geom.vertexNrFromVertexId( QgsVertexId( vid.part, vid.ring, 0 ) );
+            }
           }
         }
         // now delete the duplicities

Original file line number	Diff line number	Diff line change
`@@ -1558,12 +1558,14 @@ void QgsNodeTool::deleteVertex()`
`1558`	`1558`	`for ( int i = 0; i < vertexIds.count(); ++i )`
`1559`	`1559`	`{`
`1560`	`1560`	`QgsVertexId vid;`
`1561`		`- geom.vertexIdFromVertexNr( vertexIds[i], vid );`
`1562`		`- int ringVertexCount = geom.geometry()->vertexCount( vid.part, vid.ring );`
`1563`		`- if ( vid.vertex == ringVertexCount - 1 )`
	`1561`	`+ if ( geom.vertexIdFromVertexNr( vertexIds[i], vid ) )`
`1564`	`1562`	`{`
`1565`		`- // this is the last vertex of the ring - remove the first vertex from the list`
`1566`		`- duplicateVertexIndices << geom.vertexNrFromVertexId( QgsVertexId( vid.part, vid.ring, 0 ) );`
	`1563`	`+ int ringVertexCount = geom.geometry()->vertexCount( vid.part, vid.ring );`
	`1564`	`+ if ( vid.vertex == ringVertexCount - 1 )`
	`1565`	`+ {`
	`1566`	`+ // this is the last vertex of the ring - remove the first vertex from the list`
	`1567`	`+ duplicateVertexIndices << geom.vertexNrFromVertexId( QgsVertexId( vid.part, vid.ring, 0 ) );`
	`1568`	`+ }`
`1567`	`1569`	`}`
`1568`	`1570`	`}`
`1569`	`1571`	`// now delete the duplicities`