Merge branch 'bug/systray_behavior' of git://github.com/chiiph/leap_client into develop

1 files changed, 7 insertions, 6 deletions

diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index aa29e843..a62bfc3b 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -289,18 +289,19 @@ class MainWindow(QtGui.QMainWindow):
         self._vpn_systray.setIcon(QtGui.QIcon(self.ERROR_ICON))
         self._vpn_systray.setVisible(False)
 
-    def _toggle_visible(self):
+    def _toggle_visible(self, reason=None):
         """
         SLOT
         TRIGGER: self._systray.activated
 
         Toggles the window visibility
         """
-        self.setVisible(not self.isVisible())
-        action_visible_text = self.tr("Hide")
-        if not self.isVisible():
-            action_visible_text = self.tr("Show")
-        self._action_visible.setText(action_visible_text)
+        if reason != QtGui.QSystemTrayIcon.Context:
+            self.setVisible(not self.isVisible())
+            action_visible_text = self.tr("Hide")
+            if not self.isVisible():
+                action_visible_text = self.tr("Show")
+            self._action_visible.setText(action_visible_text)
 
     def _center_window(self):
         """