summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-10-16 17:06:24 -0300
committerKali Kaneko <kali@leap.se>2013-10-16 17:06:24 -0300
commit0c2567096393f9a8fa86e0e7d8460ccca15756d7 (patch)
treef8e3b80af31f188ab089d1eae5f4f1186fb1bdff /src/leap/bitmask/gui/mainwindow.py
parent36c36bc9dc9fed643245c9c96a9840f06c515ec1 (diff)
parent2a920d3b499c4a35d647c181eb596d041c2deead (diff)
Merge remote-tracking branch 'ivan-github/bug/4116_remember-last-login-domain' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 5d7f717b..f5631c69 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -583,6 +583,11 @@ class MainWindow(QtGui.QMainWindow):
self._wizard = None
else:
self._try_autostart_eip()
+
+ domain = self._settings.get_provider()
+ if domain is not None:
+ self._login_widget.select_provider_by_name(domain)
+
if not self._settings.get_remember():
# nothing to do here
return
@@ -600,9 +605,6 @@ class MainWindow(QtGui.QMainWindow):
# fill the username
self._login_widget.set_user(username)
- # select the configured provider in the combo box
- self._login_widget.select_provider_by_name(domain)
-
self._login_widget.set_remember(True)
saved_password = None