Avoid duplicate changed signals thrown by QgsAuthConfigSelect

qgis · Dec 14, 2018 · 56bd682 · 56bd682
1 parent 11ea28a
commit 56bd682
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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;
 };