[composer] Avoid crash when atlas page name field has spaces

Fix #15297 (cherry-picked from 631b5e8)
qgis · Jul 19, 2016 · 8f2eb81 · 8f2eb81
1 parent 5dabc9d
commit 8f2eb81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -271,8 +271,9 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int
   updateAtlasFeatures();
 }
 
-void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString& expression, bool valid )
+void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString&, bool valid )
 {
+  QString expression = mPageNameWidget->asExpression();
   QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
   if ( !atlasMap || ( !valid && !expression.isEmpty() ) )
   {

diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -220,7 +220,10 @@ int QgsAtlasComposition::updateFeatures()
     {
       nameExpression.reset( nullptr );
     }
-    nameExpression->prepare( &expressionContext );
+    else
+    {
+      nameExpression->prepare( &expressionContext );
+    }
   }
 
   // We cannot use nextFeature() directly since the feature pointer is rewinded by the rendering process