Merge pull request #5302 from boundlessgeo/issue_16803_DefaultIcon_to_avoid_segfault

elpaso · web-flow · commit d3109715d20c · 2017-10-13T16:21:03.000+02:00
set default legend raster icon when wms layer
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -227,6 +227,12 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
         if ( testFlag( ShowRasterPreviewIcon ) )
         {
           QgsRasterLayer* rlayer = qobject_cast<QgsRasterLayer *>( layer );
+          // avoid to create preview for wms that imply a better multi thread management
+          // due to async nature of wms.
+          // The following two line of code is part of the fix of
+          // https://issues.qgis.org/issues/16803
+          if ( rlayer->providerType() == QLatin1String( "wms" ) )
+            return QgsLayerItem::iconRaster();
           return QIcon( QPixmap::fromImage( rlayer->previewAsImage( QSize( 32, 32 ) ) ) );
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,12 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const`
`227`	`227`	`if ( testFlag( ShowRasterPreviewIcon ) )`
`228`	`228`	`{`
`229`	`229`	`QgsRasterLayer* rlayer = qobject_cast<QgsRasterLayer *>( layer );`
	`230`	`+ // avoid to create preview for wms that imply a better multi thread management`
	`231`	`+ // due to async nature of wms.`
	`232`	`+ // The following two line of code is part of the fix of`
	`233`	`+ // https://issues.qgis.org/issues/16803`
	`234`	`+ if ( rlayer->providerType() == QLatin1String( "wms" ) )`
	`235`	`+ return QgsLayerItem::iconRaster();`
`230`	`236`	`return QIcon( QPixmap::fromImage( rlayer->previewAsImage( QSize( 32, 32 ) ) ) );`
`231`	`237`	`}`
`232`	`238`	`else`