accounts_dialog_cms_prepare_cb: don't update the settings if we are already preparing one

This may lead to ignoring the existing setting if it's a slow one to prepare
(as Haze for example). (#647641)

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 83179a8b9f1f8afd9d217e2ef90dd5fab14a42f0..29d9b802edacc804d3546aacdbedd31b4e5f7b37 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2021,7 +2021,9 @@ accounts_dialog_cms_prepare_cb (GObject *source,
   if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
     goto out;
 
-  accounts_dialog_update_settings (dialog, NULL);
+  /* No need to update the settings if we are already preparing one */
+  if (priv->settings_ready == NULL)
+    accounts_dialog_update_settings (dialog, NULL);
 
   if (priv->initial_selection != NULL)
     {