Merge pull request #2880 from rouault/avoid_busy_loop_in_QgsVectorLay…

…erRenderer_drawRendererV2 QgsVectorLayerRenderer::drawRendererV2(): make it cancellable in all …
qgis · Mar 7, 2016 · 7ade582 · 7ade582
2 parents ed3cb12 + b1f5b5f
commit 7ade582
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -295,15 +295,15 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit )
   {
     try
     {
-      if ( !fet.constGeometry() )
-        continue; // skip features without geometry
-
       if ( mContext.renderingStopped() )
       {
         QgsDebugMsg( QString( "Drawing of vector layer %1 cancelled." ).arg( layerID() ) );
         break;
       }
 
+      if ( !fet.constGeometry() )
+        continue; // skip features without geometry
+
       mContext.expressionContext().setFeature( fet );
 
       bool sel = mContext.showSelection() && mSelectedFeatureIds.contains( fet.id() );