Merge remote-tracking branch 'chiiph/bug/mark_already_started_false' into develop

1 files changed, 17 insertions, 1 deletions

diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index d603809e..e135c798 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -194,7 +194,7 @@ class MainWindow(QtGui.QMainWindow):
         self._eip_bootstrapper = EIPBootstrapper()
 
         self._eip_bootstrapper.download_config.connect(
-            self._intermediate_stage)
+            self._eip_intermediate_stage)
         self._eip_bootstrapper.download_client_certificate.connect(
             self._finish_eip_bootstrap)
 
@@ -1162,6 +1162,7 @@ class MainWindow(QtGui.QMainWindow):
             else:
                 self._set_eip_status(data[self._eip_bootstrapper.ERROR_KEY],
                                      error=True)
+            self._already_started_eip = False
 
     def _logout(self):
         """
@@ -1207,6 +1208,21 @@ class MainWindow(QtGui.QMainWindow):
             self._login_widget.set_status(
                 data[self._provider_bootstrapper.ERROR_KEY])
 
+    def _eip_intermediate_stage(self, data):
+        """
+        SLOT
+        TRIGGERS:
+          self._eip_bootstrapper.download_config
+
+        If there was a problem, displays it, otherwise it does nothing.
+        This is used for intermediate bootstrapping stages, in case
+        they fail.
+        """
+        passed = data[self._provider_bootstrapper.PASSED_KEY]
+        if not passed:
+            self._set_status(data[self._provider_bootstrapper.ERROR_KEY])
+            self._already_started_eip = False
+
     def _eip_finished(self, exitCode):
         """
         SLOT