[Geometry checker] Fix crash in QgsGeometryAreaCheck::mergeWithNeighbor due to incorrect code ordering

manisandro · manisandro · commit a0b9877b3d03 · 2016-03-24T23:15:10.000+01:00
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp
@@ -182,14 +182,6 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx,
     return method == MergeIdenticalAttribute ? true : false;
   }
 
-
-  // Remove polygon from source geometry
-  deleteFeatureGeometryPart( feature, partIdx, changes );
-  if ( mergeFeature.id() == feature.id() && mergePartIdx > partIdx )
-  {
-    --mergePartIdx;
-  }
-
   // Merge geometries
   QgsAbstractGeometryV2* mergeGeom = mergeFeature.geometry()->geometry();
   QgsGeometryEngine* geomEngine = QgsGeomUtils::createGeomEngine( QgsGeomUtils::getGeomPart( mergeGeom, mergePartIdx ), QgsGeometryCheckPrecision::tolerance() );
@@ -199,6 +191,14 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx,
   {
     return false;
   }
+
+  // Remove polygon from source geometry
+  deleteFeatureGeometryPart( feature, partIdx, changes );
+  if ( mergeFeature.id() == feature.id() && mergePartIdx > partIdx )
+  {
+    --mergePartIdx;
+  }
+  // Replace polygon in merge geometry
   replaceFeatureGeometryPart( mergeFeature, mergePartIdx, combinedGeom, changes );
 
   return true;
