Set scope directly to new context

mhugent · mhugent · commit 4cc85fd2a9a6 · 2016-11-18T10:51:48.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2084,9 +2084,8 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const
   if ( ctx )
   {
     QgsExpressionContext newContext;
+    newContext.appendScope( QgsExpressionContextUtils::projectScope() );
     ctx->setExpressionContext( newContext );
-    QgsExpressionContext&  expCtx = ctx->expressionContext();
-    expCtx.appendScope( QgsExpressionContextUtils::projectScope() );
   }
 
   return 0;

Original file line number	Diff line number	Diff line change
`@@ -2084,9 +2084,8 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const`
`2084`	`2084`	`if ( ctx )`
`2085`	`2085`	`{`
`2086`	`2086`	`QgsExpressionContext newContext;`
	`2087`	`+ newContext.appendScope( QgsExpressionContextUtils::projectScope() );`
`2087`	`2088`	`ctx->setExpressionContext( newContext );`
`2088`		`- QgsExpressionContext& expCtx = ctx->expressionContext();`
`2089`		`- expCtx.appendScope( QgsExpressionContextUtils::projectScope() );`
`2090`	`2089`	`}`
`2091`	`2090`
`2092`	`2091`	`return 0;`