Fix missing mapserver legends in some circumstances

qgis · Jun 7, 2019 · 4a60e18 · 4a60e18
1 parent 75e2252
commit 4a60e18
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp
@@ -108,7 +108,9 @@ void QgsAmsLegendFetcher::handleFinished()
   {
     QVariantMap queryResultMap = result.toMap();
     QString layerId = queryResultMap[QStringLiteral( "layerId" )].toString();
-    if ( layerId != dataSource.param( QStringLiteral( "layer" ) ) && !mProvider->subLayers().contains( layerId ) )
+    if ( !dataSource.param( QStringLiteral( "layer" ) ).isNull()
+         && layerId != dataSource.param( QStringLiteral( "layer" ) )
+         && !mProvider->subLayers().contains( layerId ) )
     {
       continue;
     }