sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix running expressions without context

Browse Source
This commit is contained in:
Matthias Kuhn 2017-07-07 11:42:39 +02:00
parent 30f86e6269
commit 795e2477cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/expression/qgsexpressionfunction.cpp
View File

@ -4313,7 +4313,7 @@ bool QgsWithVariableExpressionFunction::isStatic( const QgsExpressionNodeFunctio
QgsExpressionContext *updatedContext = const_cast<QgsExpressionContext *>( context );
updatedContext->appendScope( scope );
if ( args->at( 3 )->isStatic( parent, updatedContext ) )
if ( args->at( 2 )->isStatic( parent, updatedContext ) )
isStatic = true;
updatedContext->popScope();
}
@ -4336,9 +4336,13 @@ QVariant QgsWithVariableExpressionFunction::run( QgsExpressionNode::NodeList *ar
scope->setVariable( name.toString(), value );
QgsExpressionContext *updatedContext = const_cast<QgsExpressionContext *>( context );
if ( !context )
updatedContext = new QgsExpressionContext();
updatedContext->appendScope( scope );
result = args->at( 2 )->eval( parent, updatedContext );
delete updatedContext->popScope();
if ( !context )
delete updatedContext;
return result;
}