Minor code cleanups for composer attribute table widget

qgis · Oct 19, 2014 · 0c4e8e6 · 0c4e8e6
1 parent 7773d4e
commit 0c4e8e6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -565,14 +565,17 @@ void QgsComposerAttributeTableWidget::updateRelationsCombo()
   QgsVectorLayer* atlasLayer = atlasCoverageLayer();
   if ( atlasLayer )
   {
-    QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( mComposerTable->composition()->atlasComposition().coverageLayer() );
+    QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( atlasLayer );
     Q_FOREACH ( const QgsRelation& relation, relations )
     {
       mRelationsComboBox->addItem( relation.name(), relation.id() );
     }
+    if ( mComposerTable )
+    {
+      mRelationsComboBox->setCurrentIndex( mRelationsComboBox->findData( mComposerTable->relationId() ) );
+    }
   }
 
-  mRelationsComboBox->setCurrentIndex( mRelationsComboBox->findData( mComposerTable->relationId() ) );
   mRelationsComboBox->blockSignals( false );
 }