refs #7408

Fix error reporting when the filename expression is invalid
qgis · Mar 21, 2013 · aa43c9237669bd3a63b78bcee0f1f348abc2bca3 · aa43c92
1 parent 12f0947
commit aa43c9237669bd3a63b78bcee0f1f348abc2bca3
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/core/composer/qgsatlascomposition.cpp
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -227,7 +227,7 @@ void QgsAtlasComposition::prepareForFeature( size_t featureI )
   if ( !mSingleFile && mFilenamePattern.size() > 0 )
   {
     QgsExpression::setSpecialColumn( "$feature", QVariant(( int )featureI + 1 ) );
-    QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature );
+    QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature, mCoverageLayer->pendingFields() );
     if ( mFilenameExpr->hasEvalError() )
     {
       throw std::runtime_error( tr( "Filename eval error: %1" ).arg( mFilenameExpr->evalErrorString() ).toLocal8Bit().data() );