Fix #13224 add joins crashes if no other vector layer exists

3nids · 3nids · commit ab7c0bff8719 · 2015-08-24T15:22:10.000+02:00
diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp
@@ -47,7 +47,7 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> already
   mCacheInMemoryCheckBox->setChecked( true );
 
   QgsMapLayer *joinLayer = mJoinLayerComboBox->currentLayer();
-  if ( joinLayer->isValid() )
+  if ( joinLayer && joinLayer->isValid() )
   {
     mJoinFieldComboBox->setLayer( joinLayer );
     joinedLayerChanged( joinLayer );

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> already`
`47`	`47`	`mCacheInMemoryCheckBox->setChecked( true );`
`48`	`48`
`49`	`49`	`QgsMapLayer *joinLayer = mJoinLayerComboBox->currentLayer();`
`50`		`- if ( joinLayer->isValid() )`
	`50`	`+ if ( joinLayer && joinLayer->isValid() )`
`51`	`51`	`{`
`52`	`52`	`mJoinFieldComboBox->setLayer( joinLayer );`
`53`	`53`	`joinedLayerChanged( joinLayer );`