Fix QgsGeometryEditUtils::addPart deleting added geometry

manisandro · manisandro · commit 5f78d1c9fa59 · 2015-09-21T10:03:25.000+02:00
diff --git a/src/core/geometry/qgsgeometryeditutils.cpp b/src/core/geometry/qgsgeometryeditutils.cpp
@@ -134,7 +134,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome
 
       int i;
       int n = geomCollection->numGeometries();
-      for ( i = 0; i < parts->numGeometries() && geomCollection->addGeometry( parts->geometryN( i ) ); i++ )
+      for ( i = 0; i < parts->numGeometries() && geomCollection->addGeometry( parts->geometryN( i )->clone() ); i++ )
         ;
 
       added = i == parts->numGeometries();
@@ -145,11 +145,6 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome
         delete part; return 2;
       }
 
-      while ( parts->numGeometries() > 0 )
-      {
-        parts->removeGeometry( 0 );
-      }
-
       delete part;
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome`
`134`	`134`
`135`	`135`	`int i;`
`136`	`136`	`int n = geomCollection->numGeometries();`
`137`		`- for ( i = 0; i < parts->numGeometries() && geomCollection->addGeometry( parts->geometryN( i ) ); i++ )`
	`137`	`+ for ( i = 0; i < parts->numGeometries() && geomCollection->addGeometry( parts->geometryN( i )->clone() ); i++ )`
`138`	`138`	`;`
`139`	`139`
`140`	`140`	`added = i == parts->numGeometries();`
`@@ -145,11 +145,6 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome`
`145`	`145`	`delete part; return 2;`
`146`	`146`	`}`
`147`	`147`
`148`		`- while ( parts->numGeometries() > 0 )`
`149`		`- {`
`150`		`- parts->removeGeometry( 0 );`
`151`		`- }`
`152`		`-`
`153`	`148`	`delete part;`
`154`	`149`	`}`
`155`	`150`	`else`