summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-05 17:07:42 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-05 17:07:42 -0300
commitb7a323da8610e7722cad2353394f4843c5437ed3 (patch)
tree5eb0b207c962a85d3c05c5e3a0d45ed9d69a1622 /src/leap
parent4480361f2fbdd293840f4eb1942c3edab2ff40c0 (diff)
parent24a997667abfa0f4f414c2206236be44a09094ef (diff)
Merge remote-tracking branch 'ivan/bug/3067_faulty-multiple-provider-selection' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/gui/mainwindow.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 5e7965dd..7180139a 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -698,11 +698,16 @@ class MainWindow(QtGui.QMainWindow):
"""
if data[self._provider_bootstrapper.PASSED_KEY]:
provider = self._login_widget.get_selected_provider()
- if self._provider_config.loaded() or \
- self._provider_config.load(os.path.join("leap",
- "providers",
- provider,
- "provider.json")):
+
+ # If there's no loaded provider or
+ # we want to connect to other provider...
+ if (not self._provider_config.loaded() or
+ self._provider_config.get_domain() != provider):
+ self._provider_config.load(
+ os.path.join("leap", "providers",
+ provider, "provider.json"))
+
+ if self._provider_config.loaded():
self._provider_bootstrapper.run_provider_setup_checks(
self._provider_config,
download_if_needed=True)