union: throw an exception if the second layer is specified but not valid

qgis · May 10, 2018 · 191b0d4 · 191b0d4
1 parent 7df062b
commit 191b0d4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/analysis/processing/qgsalgorithmunion.cpp b/src/analysis/processing/qgsalgorithmunion.cpp
@@ -65,7 +65,8 @@ QVariantMap QgsUnionAlgorithm::processAlgorithm( const QVariantMap &parameters,
     throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "INPUT" ) ) );
 
   std::unique_ptr< QgsFeatureSource > sourceB( parameterAsSource( parameters, QStringLiteral( "OVERLAY" ), context ) );
-  // sourceB is optional so we do not throw an error if it is not a valid source
+  if ( parameters.value( QStringLiteral( "OVERLAY" ) ).isValid() && !sourceB )
+    throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "OVERLAY" ) ) );
 
   QgsWkbTypes::Type geomType = QgsWkbTypes::multiType( sourceA->wkbType() );