summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-07-31 14:52:06 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-07-31 14:52:06 -0300
commit429cc2681e74785e3e88b270730e246f3f9f3ce7 (patch)
tree8aa9f8a1a9c1f77098337442eac77d52c720b214 /src/leap/bitmask/gui
parent87869ff34efce43a331d238db64b768b616b129a (diff)
parent75eddcf502d23f761cbac26da34fcfd1ab669b8b (diff)
Merge remote-tracking branch 'chiiph/bug/properly_enable_keyring' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/login.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py
index baf29c23..8e0a3a15 100644
--- a/src/leap/bitmask/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
@@ -216,8 +216,7 @@ class LoginWidget(QtGui.QWidget):
"""
self.ui.lnUser.setEnabled(enabled)
self.ui.lnPassword.setEnabled(enabled)
- if has_keyring():
- self.ui.chkRemember.setEnabled(enabled)
+ self.ui.chkRemember.setEnabled(enabled and has_keyring())
self.ui.cmbProviders.setEnabled(enabled)
self._set_cancel(not enabled)