Cleanup of validation objects and markers

qgis · Apr 6, 2017 · 80cef51 · 80cef51
1 parent 9619d5e
commit 80cef51
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/app/nodetool/qgsnodetool2.cpp b/src/app/nodetool/qgsnodetool2.cpp
@@ -258,6 +258,12 @@ void QgsNodeTool2::deactivate()
   setHighlightedNodes( QList<Vertex>() );
   removeTemporaryRubberBands();
   cleanupNodeEditor();
+
+  QHash< QPair<QgsVectorLayer *, QgsFeatureId>, GeometryValidation>::iterator it = mValidations.begin();
+  for ( ; it != mValidations.end(); ++it )
+    it->cleanup();
+  mValidations.clear();
+
   QgsMapToolAdvancedDigitizing::deactivate();
 }
 
@@ -1701,6 +1707,13 @@ void QgsNodeTool2::validationFinished()
     {
       QStatusBar *sb = QgisApp::instance()->statusBar();
       sb->showMessage( tr( "Validation finished (%n error(s) found).", "number of geometry errors", validation.errorMarkers.size() ) );
+      if ( validation.errorMarkers.isEmpty() )
+      {
+        // not needed anymore (no markers to keep displayed)
+        validation.cleanup();
+        mValidations.remove( it.key() );
+      }
+      break;
     }
   }
 }