WMS: don't crash on invalid layers

Fixes #43580
qgis · Jun 7, 2021 · 40cc12f · 40cc12f
1 parent acdcfc3
commit 40cc12f
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -1071,23 +1071,31 @@ QImage QgsWmsLegendNode::getLegendGraphic() const
     // and start a new one ?
 
     QgsRasterLayer *layer = qobject_cast<QgsRasterLayer *>( mLayerNode->layer() );
-    const QgsLayerTreeModel *mod = model();
+
-    if ( ! mod )
+    if ( layer && layer->isValid() )
-      return mImage;
+    {
-    const QgsMapSettings *ms = mod->legendFilterMapSettings();
+      const QgsLayerTreeModel *mod = model();
-
+      if ( ! mod )
-    QgsRasterDataProvider *prov = layer->dataProvider();
+        return mImage;
-    if ( ! prov )
+      const QgsMapSettings *ms = mod->legendFilterMapSettings();
-      return mImage;
+
-
+      QgsRasterDataProvider *prov = layer->dataProvider();
-    Q_ASSERT( ! mFetcher );
+      if ( ! prov )
-    mFetcher.reset( prov->getLegendGraphicFetcher( ms ) );
+        return mImage;
-    if ( mFetcher )
+
+      Q_ASSERT( ! mFetcher );
+      mFetcher.reset( prov->getLegendGraphicFetcher( ms ) );
+      if ( mFetcher )
+      {
+        connect( mFetcher.get(), &QgsImageFetcher::finish, this, &QgsWmsLegendNode::getLegendGraphicFinished );
+        connect( mFetcher.get(), &QgsImageFetcher::error, this, &QgsWmsLegendNode::getLegendGraphicErrored );
+        connect( mFetcher.get(), &QgsImageFetcher::progress, this, &QgsWmsLegendNode::getLegendGraphicProgress );
+        mFetcher->start();
+      }
+    }
+    else
     {
-      connect( mFetcher.get(), &QgsImageFetcher::finish, this, &QgsWmsLegendNode::getLegendGraphicFinished );
+      QgsDebugMsg( tr( "Failed to download legend graphics: layer is not valid." ) );
-      connect( mFetcher.get(), &QgsImageFetcher::error, this, &QgsWmsLegendNode::getLegendGraphicErrored );
-      connect( mFetcher.get(), &QgsImageFetcher::progress, this, &QgsWmsLegendNode::getLegendGraphicProgress );
-      mFetcher->start();
     }
   }