fix #5617. Patch submitted by Salvatore Larosa, thanks!

qgis · May 22, 2012 · 049f5ca · 049f5ca
1 parent a76d629
commit 049f5ca
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -1147,18 +1147,20 @@ def union( self ):
                 temp_list = int_geom.asGeometryCollection()
                 for i in temp_list:
                   if i.type() == geom.type():
+                    int_geom = QgsGeometry( i )
                     try:
-                      outFeat.setGeometry( j )
+                      outFeat.setGeometry( int_geom )
                       outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
                       writer.addFeature( outFeat )
                     except Exception, err:
                       FEATURE_EXCEPT = False
-              try:
-                outFeat.setGeometry( int_geom )
-                outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                writer.addFeature( outFeat )
-              except Exception, err:
-                FEATURE_EXCEPT = False
+              else:
+                try:
+                  outFeat.setGeometry( int_geom )
+                  outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                  writer.addFeature( outFeat )
+                except Exception, err:
+                  FEATURE_EXCEPT = False
             else:
               # this only happends if the bounding box
               # intersects, but the geometry doesn't