Fix invisble annotations are still rendered

Fixes #17763
qgis · Jan 3, 2018 · a4147b7 · a4147b7
1 parent 230e91c
commit a4147b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/gui/qgsmapcanvasannotationitem.cpp b/src/gui/qgsmapcanvasannotationitem.cpp
@@ -287,6 +287,9 @@ double QgsMapCanvasAnnotationItem::scaledSymbolSize() const
 
 void QgsMapCanvasAnnotationItem::paint( QPainter *painter )
 {
+  if ( !mAnnotation || !mAnnotation->isVisible() )
+    return;
+
   QgsRenderContext rc = QgsRenderContext::fromQPainter( painter );
   rc.setFlag( QgsRenderContext::Antialiasing, true );
 

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2806,11 +2806,14 @@ namespace QgsWms
   void QgsRenderer::annotationsRendering( QPainter *painter ) const
   {
     const QgsAnnotationManager *annotationManager = mProject->annotationManager();
-    QList< QgsAnnotation * > annotations = annotationManager->annotations();
+    const QList< QgsAnnotation * > annotations = annotationManager->annotations();
 
     QgsRenderContext renderContext = QgsRenderContext::fromQPainter( painter );
-    Q_FOREACH ( QgsAnnotation *annotation, annotations )
+    for ( QgsAnnotation *annotation : annotations )
     {
+      if ( !annotation || !annotation->isVisible() )
+        continue;
+
       annotation->render( renderContext );
     }
   }