Merge remote-tracking branch 'refs/remotes/ivan/bug/5551_wrong-eip-status-msg' into develop

1 files changed, 6 insertions, 8 deletions

diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 3a94a58d..b49717c9 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1517,9 +1517,14 @@ class MainWindow(QtGui.QMainWindow):
         """
         self._eip_connection.qtsigs.connected_signal.emit()
 
-        # check for connectivity
         provider_config = self._get_best_provider_config()
         domain = provider_config.get_domain()
+
+        self._eip_status.set_provider(domain)
+        self._settings.set_defaultprovider(provider)
+        self._already_started_eip = True
+
+        # check for connectivity
         self._check_name_resolution(domain)
 
     def _check_name_resolution(self, domain):
@@ -1676,13 +1681,6 @@ class MainWindow(QtGui.QMainWindow):
                     "system.").format(self._eip_name))
         self._set_eipstatus_off()
 
-    def _on_eip_connected(self):
-        # XXX move to the state machine too
-        self._eip_status.set_provider(provider)
-
-        self._settings.set_defaultprovider(provider)
-        self._already_started_eip = True
-
     @QtCore.Slot()
     def _stop_eip(self):
         """