summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-08-18 22:02:09 -0500
committerKali Kaneko <kali@leap.se>2014-08-18 22:08:20 -0500
commit9f8c6bdda8ca6274e2d013d6528ab4ff83b35654 (patch)
treea7871ab476f70fbd04b7066bec4adc1f4f8c8518 /src/leap/bitmask
parent1f3c0a840e5f8aebebc6d393c31e0d85cfbf811e (diff)
make the login not wait for eip it cannot-start-eip
Diffstat (limited to 'src/leap/bitmask')
-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 960a922e..89f3c5a6 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):
"""