Make the "Merge shapefiles" tool correctly handle features without geometries.

This commit is contained in:
Juernjakob Dugge 2014-11-23 10:23:57 +01:00
parent 50d2a7495b
commit 03faafa4a2

View File

@ -317,8 +317,9 @@ class ShapeMergeThread( QThread ):
mergedAttrs[ fieldMap[shapeIndex][fieldIndex] ] = v
fieldIndex += 1
inGeom = QgsGeometry( inFeat.geometry() )
outFeat.setGeometry( inGeom )
if inFeat.geometry() is not None:
inGeom = QgsGeometry( inFeat.geometry() )
outFeat.setGeometry( inGeom )
outFeat.setAttributes( mergedAttrs )
writer.addFeature( outFeat )
self.emit( SIGNAL( "featureProcessed()" ) )