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

nyalldawson · nyalldawson · commit 631b5e87c3d4 · 2016-07-19T09:21:14.000+10:00
Fix #15297
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -272,8 +272,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
@@ -222,7 +222,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

Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,9 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int`
`272`	`272`	`updateAtlasFeatures();`
`273`	`273`	`}`
`274`	`274`
`275`		`-void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString& expression, bool valid )`
	`275`	`+void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString&, bool valid )`
`276`	`276`	`{`
	`277`	`+ QString expression = mPageNameWidget->asExpression();`
`277`	`278`	`QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();`
`278`	`279`	`if ( !atlasMap \|\| ( !valid && !expression.isEmpty() ) )`
`279`	`280`	`{`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,10 @@ int QgsAtlasComposition::updateFeatures()`
`222`	`222`	`{`
`223`	`223`	`nameExpression.reset( nullptr );`
`224`	`224`	`}`
`225`		`- nameExpression->prepare( &expressionContext );`
	`225`	`+ else`
	`226`	`+ {`
	`227`	`+ nameExpression->prepare( &expressionContext );`
	`228`	`+ }`
`226`	`229`	`}`
`227`	`230`
`228`	`231`	`// We cannot use nextFeature() directly since the feature pointer is rewinded by the rendering process`