summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-02-19 18:34:44 -0300
committerKali Kaneko <kali@leap.se>2015-02-23 12:10:41 -0400
commitb5af597c9ee51a3334416b775ef1397a3bef4430 (patch)
tree70c25ce486d86ee5f2403d8dc187636c64be85c0
parent39c3e4c107dbcaddf2bb801a34de497a6b93384e (diff)
[Cherry Pick] Regression fix: Use the right provider to log in.
FIX: Login attempt is made against previously selected provider. Closes #6654. Cherry-picked from release/0.8.x since it's a very annoying bug for the testing cycles for the next release (0.9.0) -- kali.
-rw-r--r--changes/bug-6654_use-correct-provider1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changes/bug-6654_use-correct-provider b/changes/bug-6654_use-correct-provider
new file mode 100644
index 00000000..511e2fea
--- /dev/null
+++ b/changes/bug-6654_use-correct-provider
@@ -0,0 +1 @@
+- #6654: Regression fix, login attempt is made against previously selected provider.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 35253ebe..55628847 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -775,6 +775,7 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
domain = self._settings.get_provider()
if domain is not None:
self._providers.select_provider_by_name(domain)
+ self._login_widget.set_provider(domain)
if not self._settings.get_remember():
# nothing to do here