Showing with 5 additions and 4 deletions.

+4 −4 src/gui/qgsattributedialog.cpp

+1 −0 src/gui/qgsrelationmanagerdialog.cpp
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -271,14 +271,14 @@ void QgsAttributeDialog::init()
 
     foreach ( const QgsRelation& relation, relations )
     {
-      QWidget *myWidget = new QWidget();
-      myWidget->setProperty( "qgisRelation", relation.id() );
-      myWidget->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+      QgsRelationEditorWidget *myWidget = QgsRelationEditorWidget::createRelationEditor( relation, *mFeature, mContext, mDialog );
       if ( !myWidget )
         continue;
 
+      myWidget->setProperty( "qgisRelation", relation.id() );
+      myWidget->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
       mypInnerLayout->addWidget( myWidget, index, 0, 1, 2 );
-      mypInnerLayout->setRowStretch( index, 1 );
+      mypInnerLayout->setRowStretch( index, 2 );
       ++index;
     }
 

diff --git a/src/gui/qgsrelationmanagerdialog.cpp b/src/gui/qgsrelationmanagerdialog.cpp
@@ -118,6 +118,7 @@ void QgsRelationManagerDialog::on_mBtnAddRelation_clicked()
 
 void QgsRelationManagerDialog::on_mBtnRemoveRelation_clicked()
 {
+  if ( mRelationsTable->currentIndex().isValid() )
   mRelationsTable->removeRow( mRelationsTable->currentItem()->row() );
 }