[Geometry checker] Fix crashes in QgsGeometryGapCheck::mergeWithNeigh…

…bor due to using wrong layerId
qgis · Oct 23, 2017 · edf563b41447af00bbb933e3215afe97ea8ce8a7 · edf563b
1 parent 4a6cdbe
commit edf563b41447af00bbb933e3215afe97ea8ce8a7
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
@@ -156,7 +156,7 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError *err, Chan
   // Search for touching neighboring geometries
   for ( const QString &layerId : err->neighbors().keys() )
   {
-    QgsFeaturePool *featurePool = mContext->featurePools[ err->layerId() ];
+    QgsFeaturePool *featurePool = mContext->featurePools[ layerId ];
     QgsAbstractGeometry *errLayerGeom = errGeometry->clone();
     errLayerGeom->transform( featurePool->getLayerToMapTransform(), QgsCoordinateTransform::ReverseTransform );
 
@@ -205,7 +205,7 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError *err, Chan
   }
 
   // Add merged polygon to destination geometry
-  replaceFeatureGeometryPart( err->layerId(), mergeFeature, mergePartIdx, combinedGeom, changes );
+  replaceFeatureGeometryPart( mergeLayerId, mergeFeature, mergePartIdx, combinedGeom, changes );
 
   return true;
 }