QgsSymbolV2: only pop expression scope if it was really added

m-kuhn · m-kuhn · commit ef77e19fe342 · 2016-04-13T07:27:14.000+02:00
diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -978,7 +978,8 @@ void QgsSymbolV2::renderFeature( const QgsFeature& feature, QgsRenderContext& co
     delete segmentizedGeometry;
   }
 
-  context.expressionContext().popScope();
+  if ( mSymbolRenderContext->expressionContextScope() )
+    context.expressionContext().popScope();
 }
 
 QgsSymbolV2RenderContext* QgsSymbolV2::symbolRenderContext()

Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,8 @@ void QgsSymbolV2::renderFeature( const QgsFeature& feature, QgsRenderContext& co`
`978`	`978`	`delete segmentizedGeometry;`
`979`	`979`	`}`
`980`	`980`
`981`		`- context.expressionContext().popScope();`
	`981`	`+ if ( mSymbolRenderContext->expressionContextScope() )`
	`982`	`+ context.expressionContext().popScope();`
`982`	`983`	`}`
`983`	`984`
`984`	`985`	`QgsSymbolV2RenderContext* QgsSymbolV2::symbolRenderContext()`