Fix selecting last page from atlas combo (fix #13311)

qgis · Sep 3, 2015 · ffd82a3 · ffd82a3
1 parent 166e5bf
commit ffd82a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -1162,7 +1162,7 @@ void QgsComposer::atlasPageComboEditingFinished()
   QString text = mAtlasPageComboBox->lineEdit()->text();
 
   //find matching record in combo box
-  int page = -1;
+  int page = -1; //note - first page starts at 1, not 0
   for ( int i = 0; i < mAtlasPageComboBox->count(); ++i )
   {
     if ( text.compare( mAtlasPageComboBox->itemData( i, Qt::UserRole + 1 ).toString(), Qt::CaseInsensitive ) == 0
@@ -1175,7 +1175,7 @@ void QgsComposer::atlasPageComboEditingFinished()
   }
   bool ok = ( page > 0 );
 
-  if ( !ok || page >= mComposition->atlasComposition().numFeatures() || page < 1 )
+  if ( !ok || page > mComposition->atlasComposition().numFeatures() || page < 1 )
   {
     mAtlasPageComboBox->blockSignals( true );
     mAtlasPageComboBox->setCurrentIndex( mComposition->atlasComposition().currentFeatureNumber() );