Do not show the invalid geom warning if not necessary

If the geoms where originally invalid, do not show the warning.
qgis · Oct 6, 2018 · a3bf98d · a3bf98d
1 parent 08b6b60
commit a3bf98d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8629,6 +8629,7 @@ void QgisApp::pasteFromClipboard( QgsMapLayer *destinationLayer )
     }
 
     QgsGeometry geom = featureIt->geometry();
+    bool geomWasInvalid = geom.isEmpty() || geom.isNull( );
     if ( featureIt->hasGeometry() )
     {
       // convert geometry to match destination layer
@@ -8653,7 +8654,7 @@ void QgisApp::pasteFromClipboard( QgsMapLayer *destinationLayer )
       // avoid intersection if enabled in digitize settings
       geom.avoidIntersections( QgsProject::instance()->avoidIntersectionsLayers() );
     }
-    if ( geom.isEmpty() || geom.isNull( ) )
+    if ( ! geomWasInvalid && ( geom.isEmpty() || geom.isNull( ) ) )
       invalidGeometriesCount++;
 
     // now create new feature using pasted feature as a template. This automatically handles default