Do not show the invalid geom warning if not necessary

If the geoms where originally invalid, do not show the
warning.
This commit is contained in:
Alessandro Pasotti 2018-10-06 11:38:24 +02:00
parent 08b6b6065a
commit a3bf98d9a6

View File

@ -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