Merge pull request #1698 from jdugge/MergetoolEmptyGeometries

Make the Merge shapefiles tool correctly handle features without geometries
qgis · Nov 25, 2014 · d69c325a819a69374ecfec503ebd2daf434fe5ba · d69c325
2 parents 9cf3e7f + 03faafa
commit d69c325a819a69374ecfec503ebd2daf434fe5ba
Unified Split

Showing with 3 additions and 2 deletions.

+3 −2 python/plugins/fTools/tools/doMergeShapes.py
diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/python/plugins/fTools/tools/doMergeShapes.py
@@ -317,8 +317,9 @@ def run( self ):
             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()" ) )