Merge branch 'develop' of ssh://code.leap.se/leap_client into develop

1 files changed, 7 insertions, 0 deletions

diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index 49f044aa..0dd0f195 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -217,6 +217,8 @@ class StatusAwareTrayIconMixin(object):
         updates icon, according to the openvpn status change.
         """
         icon_name = self.conductor.get_icon_name()
+        if not icon_name:
+            return
 
         # XXX refactor. Use QStateMachine
 
@@ -228,6 +230,11 @@ class StatusAwareTrayIconMixin(object):
             leap_status_name = self.conductor.get_leap_status()
             self.eipStatusChange.emit(leap_status_name)
 
+        if icon_name == "connected":
+            # When we change to "connected', we launch
+            # the network checker.
+            self.initNetworkChecker.emit()
+
         self.setIcon(icon_name)
         # change connection pixmap widget
         self.setConnWidget(icon_name)