Set scope directly to new context

mhugent · mhugent · commit b3d5aaba6103 · 2018-02-27T15:39:12.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2198,9 +2198,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
`@@ -2198,9 +2198,8 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const`
`2198`	`2198`	`if ( ctx )`
`2199`	`2199`	`{`
`2200`	`2200`	`QgsExpressionContext newContext;`
	`2201`	`+ newContext.appendScope( QgsExpressionContextUtils::projectScope() );`
`2201`	`2202`	`ctx->setExpressionContext( newContext );`
`2202`		`- QgsExpressionContext& expCtx = ctx->expressionContext();`
`2203`		`- expCtx.appendScope( QgsExpressionContextUtils::projectScope() );`
`2204`	`2203`	`}`
`2205`	`2204`
`2206`	`2205`	`return 0;`