summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/leap/gui/mainwindow.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 7eb956cb..dad88362 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -354,15 +354,22 @@ class MainWindow(QtGui.QMainWindow):
self.ui.chkRemember.setChecked(True)
self.ui.chkAutoLogin.setEnabled(self.ui.chkRemember
.isEnabled())
- saved_password = keyring.get_password(self.KEYRING_KEY,
- saved_user
- .encode("utf8"))
+
+ saved_password = None
+ try:
+ saved_password = keyring.get_password(self.KEYRING_KEY,
+ saved_user
+ .encode("utf8"))
+ except ValueError, e:
+ logger.debug("Incorrect Password. %r." % (e,))
+
if saved_password is not None:
self.ui.lnPassword.setText(saved_password.decode("utf8"))
# Only automatically login if there is a saved user
+ # and the password was retrieved right
self.ui.chkAutoLogin.setChecked(auto_login)
- if auto_login:
+ if auto_login and saved_password:
self._login()
def _show_systray(self):