Merge branch 'release-0.7.0'0.7.0rc20.7.0rc1

1 files changed, 3 insertions, 9 deletions

diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index f721086b..5ef6befd 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -452,20 +452,14 @@ class EIP(object):
         else:
             logger.debug('EIP: no errors')
 
-    def _do_stop(self, shutdown=False, restart=False):
+    def stop(self, shutdown=False, restart=False):
         """
-        Stop the service. This is run in a thread to avoid blocking.
+        Stop the service.
         """
         self._vpn.terminate(shutdown, restart)
         if IS_LINUX:
             self._wait_for_firewall_down()
 
-    def stop(self, shutdown=False, restart=False):
-        """
-        Stop the service.
-        """
-        return threads.deferToThread(self._do_stop, shutdown, restart)
-
     def _wait_for_firewall_down(self):
         """
         Wait for the firewall to come down.
@@ -665,7 +659,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,"