Always remove join info before resetting auxiliary layer

pblottiere · pblottiere · commit a30e1cb0bd3b · 2017-10-09T05:01:35.000+01:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -4270,11 +4270,11 @@ bool QgsVectorLayer::loadAuxiliaryLayer( const QgsAuxiliaryStorage &storage )
 
 void QgsVectorLayer::setAuxiliaryLayer( QgsAuxiliaryLayer *alayer )
 {
+  if ( mAuxiliaryLayer )
+    removeJoin( mAuxiliaryLayer->id() );
+
   if ( alayer )
   {
-    if ( mAuxiliaryLayer )
-      removeJoin( mAuxiliaryLayer->id() );
-
     addJoin( alayer->joinInfo() );
 
     if ( !alayer->isEditable() )

Original file line number	Diff line number	Diff line change
`@@ -4270,11 +4270,11 @@ bool QgsVectorLayer::loadAuxiliaryLayer( const QgsAuxiliaryStorage &storage )`
`4270`	`4270`
`4271`	`4271`	`void QgsVectorLayer::setAuxiliaryLayer( QgsAuxiliaryLayer *alayer )`
`4272`	`4272`	`{`
	`4273`	`+ if ( mAuxiliaryLayer )`
	`4274`	`+ removeJoin( mAuxiliaryLayer->id() );`
	`4275`	`+`
`4273`	`4276`	`if ( alayer )`
`4274`	`4277`	`{`
`4275`		`- if ( mAuxiliaryLayer )`
`4276`		`- removeJoin( mAuxiliaryLayer->id() );`
`4277`		`-`
`4278`	`4278`	`addJoin( alayer->joinInfo() );`
`4279`	`4279`
`4280`	`4280`	`if ( !alayer->isEditable() )`