QgsSymbolV2: only pop expression scope if it was really added

(cherry-picked from ef77e19)
qgis · Apr 15, 2016 · 0161497 · 0161497
1 parent e8dc831
commit 0161497
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -934,7 +934,8 @@ void QgsSymbolV2::renderFeature( const QgsFeature& feature, QgsRenderContext& co
     delete segmentizedGeometry;
   }
 
-  context.expressionContext().popScope();
+  if ( mSymbolRenderContext->expressionContextScope() )
+    context.expressionContext().popScope();
 }
 
 QgsSymbolV2RenderContext* QgsSymbolV2::symbolRenderContext()