summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-08-18 22:02:09 -0500
committerTomás Touceda <chiiph@leap.se>2014-08-19 10:46:54 -0300
commit5a73c6625e74809acfd65e9ee559790409f4ee20 (patch)
tree088ab95c08bba8aeb352bdc2513c0346127dd00d
parentfb9bad95cc4bd2769af5f91c2f0cac1be4c3c617 (diff)
make the login not wait for eip it cannot-start-eip
-rw-r--r--src/leap/bitmask/backend/components.py2
-rw-r--r--src/leap/bitmask/gui/mainwindow.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index f721086b..03fcf0cb 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -665,7 +665,7 @@ class EIP(object):
return False
client_cert_path = eip_config.\
- get_client_cert_path(provider_config, about_to_download=False)
+ get_client_cert_path(provider_config, about_to_download=True)
if leap_certs.should_redownload(client_cert_path):
logger.error("The client should redownload the certificate,"
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 8ce7f2fc..70a3f388 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -703,6 +703,10 @@ class MainWindow(QtGui.QMainWindow):
self._eip_status.disable_eip_start()
self._eip_status.set_eip_status(self.tr("Disabled"))
+ # this state flag is responsible for deferring the login
+ # so we must update it, otherwise we're in a deadlock.
+ self._trying_to_start_eip = False
+
@QtCore.Slot()
def _disable_eip_missing_helpers(self):
"""