populate join fields combobox if layer already selected

alexbruy · alexbruy · commit 7aa72ab92488 · 2015-05-20T10:16:07.000+03:00
diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp
@@ -45,6 +45,13 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> already
   connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( joinedLayerChanged( QgsMapLayer* ) ) );
 
   mCacheInMemoryCheckBox->setChecked( true );
+
+  QgsMapLayer *joinLayer = mJoinLayerComboBox->currentLayer();
+  if ( joinLayer->isValid() )
+  {
+    mJoinFieldComboBox->setLayer( joinLayer );
+    joinedLayerChanged( joinLayer );
+  }
 }
 
 QgsJoinDialog::~QgsJoinDialog()
@@ -126,7 +133,6 @@ bool QgsJoinDialog::createAttributeIndex() const
 
 void QgsJoinDialog::joinedLayerChanged( QgsMapLayer* layer )
 {
-
   mJoinFieldComboBox->clear();
 
   QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( layer );
