[composer] Fix setting atlas filename pattern from expression dialog (f…

…ix #10628)
qgis · Jun 18, 2014 · d61c536 · d61c536
1 parent 6d6eede
commit d61c536
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -123,8 +123,18 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
     QString expression =  exprDlg.expressionText();
     if ( !expression.isEmpty() )
     {
-      // will emit a textChanged signal
+      //set atlas filename expression
       mAtlasFilenamePatternEdit->setText( expression );
+      if ( ! atlasMap->setFilenamePattern( expression ) )
+      {
+        //expression could not be set
+        QMessageBox::warning( this
+                              , tr( "Could not evaluate filename pattern" )
+                              , tr( "Could not set filename pattern as '%1'.\nParser error:\n%2" )
+                              .arg( expression )
+                              .arg( atlasMap->filenamePatternErrorString() )
+                            );
+      }
     }
   }
 }