Avoid duplicate changed signals thrown by QgsAuthConfigSelect

nyalldawson · nyalldawson · commit 56bd682d9667 · 2018-12-15T08:23:10.000+10:00
diff --git a/src/gui/auth/qgsauthconfigselect.cpp b/src/gui/auth/qgsauthconfigselect.cpp
@@ -83,7 +83,11 @@ void QgsAuthConfigSelect::setConfigId( const QString &authcfg )
     {
       mAuthCfg = authcfg;
     }
+    // avoid duplicate call to loadConfig(), which may potentially be triggered by combo box index changes in the
+    // call to populateConfigSelector(). We *always* call loadConfig() after this, so we don't want to do it twice.
+    mTemporarilyBlockLoad = true;
     populateConfigSelector();
+    mTemporarilyBlockLoad = false;
     loadConfig();
   }
 }
@@ -197,7 +201,8 @@ void QgsAuthConfigSelect::cmbConfigSelect_currentIndexChanged( int index )
 {
   QString authcfg = cmbConfigSelect->itemData( index ).toString();
   mAuthCfg = ( !authcfg.isEmpty() && authcfg != QLatin1String( "0" ) ) ? authcfg : QString();
-  loadConfig();
+  if ( !mTemporarilyBlockLoad )
+    loadConfig();
 }
 
 void QgsAuthConfigSelect::btnConfigAdd_clicked()
diff --git a/src/gui/auth/qgsauthconfigselect.h b/src/gui/auth/qgsauthconfigselect.h
@@ -93,6 +93,7 @@ class GUI_EXPORT QgsAuthConfigSelect : public QWidget, private Ui::QgsAuthConfig
     bool mDisabled = false;
     QVBoxLayout *mAuthNotifyLayout = nullptr;
     QLabel *mAuthNotify = nullptr;
+    bool mTemporarilyBlockLoad = false;
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,11 @@ void QgsAuthConfigSelect::setConfigId( const QString &authcfg )`
`83`	`83`	`{`
`84`	`84`	`mAuthCfg = authcfg;`
`85`	`85`	`}`
	`86`	`+ // avoid duplicate call to loadConfig(), which may potentially be triggered by combo box index changes in the`
	`87`	`+ // call to populateConfigSelector(). We always call loadConfig() after this, so we don't want to do it twice.`
	`88`	`+ mTemporarilyBlockLoad = true;`
`86`	`89`	`populateConfigSelector();`
	`90`	`+ mTemporarilyBlockLoad = false;`
`87`	`91`	`loadConfig();`
`88`	`92`	`}`
`89`	`93`	`}`
`@@ -197,7 +201,8 @@ void QgsAuthConfigSelect::cmbConfigSelect_currentIndexChanged( int index )`
`197`	`201`	`{`
`198`	`202`	`QString authcfg = cmbConfigSelect->itemData( index ).toString();`
`199`	`203`	`mAuthCfg = ( !authcfg.isEmpty() && authcfg != QLatin1String( "0" ) ) ? authcfg : QString();`
`200`		`- loadConfig();`
	`204`	`+ if ( !mTemporarilyBlockLoad )`
	`205`	`+ loadConfig();`
`201`	`206`	`}`
`202`	`207`
`203`	`208`	`void QgsAuthConfigSelect::btnConfigAdd_clicked()`