Fix geometry cache invalidation in vertex tool

Partial backport of 21a7e15
qgis · Jan 16, 2019 · f99a911 · f99a911
1 parent 7ab24c8
commit f99a911
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -980,15 +980,17 @@ void QgsVertexTool::keyPressEvent( QKeyEvent *e )
 
 QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatureId fid )
 {
-  if ( !mCache.contains( layer ) )
+  const bool layerWasNotInCache = !mCache.contains( layer );
+  // insert if it was not in cache
+  QHash<QgsFeatureId, QgsGeometry>& layerCache = mCache[layer];
+  if ( layerWasNotInCache )
   {
     connect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );
     connect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );
     connect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );
     connect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );
   }
 
-  QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];
   if ( !layerCache.contains( fid ) )
   {
     QgsFeature f;
@@ -1008,6 +1010,10 @@ void QgsVertexTool::clearGeometryCache()
 {
   const QgsVectorLayer *layer = qobject_cast<const QgsVectorLayer *>( sender() );
   mCache.remove( layer );
+  disconnect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );
+  disconnect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );
+  disconnect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );
+  disconnect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );
 }
 
 void QgsVertexTool::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry &geom )