[processing] Skip _all_ curved labels, not only the first one, in the…

… extract labels algorithm
qgis · Jan 7, 2022 · 4f1168d · 4f1168d
1 parent 0120072
commit 4f1168d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/analysis/processing/qgsalgorithmextractlabels.cpp b/src/analysis/processing/qgsalgorithmextractlabels.cpp
@@ -146,12 +146,14 @@ class ExtractLabelSink : public QgsLabelSink
       }
 
       const QgsFeatureId fid = label->getFeaturePart()->featureId();
-      if ( ( settings.placement == QgsPalLayerSettings::Curved ||
-             settings.placement == QgsPalLayerSettings::PerimeterCurved )
-           && !mCurvedWarningPushed.contains( layerId ) )
+      if ( settings.placement == QgsPalLayerSettings::Curved ||
+           settings.placement == QgsPalLayerSettings::PerimeterCurved )
       {
-        mCurvedWarningPushed << layerId;
-        mFeedback->pushWarning( QObject::tr( "Curved placement not supported, skipping labels from layer %1" ).arg( mMapLayerNames.value( layerId ) ) );
+        if ( !mCurvedWarningPushed.contains( layerId ) )
+        {
+          mCurvedWarningPushed << layerId;
+          mFeedback->pushWarning( QObject::tr( "Curved placement not supported, skipping labels from layer %1" ).arg( mMapLayerNames.value( layerId ) ) );
+        }
         return;
       }